projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Catching up to latest thread changes
[wxWidgets.git]
/
src
/
zlib
/
zconf.h
diff --git
a/src/zlib/zconf.h
b/src/zlib/zconf.h
index 89e1a16c0d347fb63ee4cb9e36b550ebd3faffb9..8739a450de2f9ae593960d85e272c369782ac1e9 100644
(file)
--- a/
src/zlib/zconf.h
+++ b/
src/zlib/zconf.h
@@
-1,6
+1,6
@@
/* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-1998 Jean-loup Gailly.
/* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
+ * For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id$ */
*/
/* @(#) $Id$ */
@@
-51,7
+51,7
@@
#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
# define WIN32
#endif
#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
# define WIN32
#endif
-#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
+#if defined(__GNUC__) || defined(WIN32) || defined(
OS232) || defined(
__386__) || defined(i386)
# ifndef __32BIT__
# define __32BIT__
# endif
# ifndef __32BIT__
# define __32BIT__
# endif
@@
-71,7
+71,7
@@
# define UNALIGNED_OK
#endif
# define UNALIGNED_OK
#endif
-#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32)) && !defined(STDC)
+#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32)
|| defined(OS232)
) && !defined(STDC)
# define STDC
#endif
#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
# define STDC
#endif
#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
@@
-196,6
+196,9
@@
typedef unsigned long uLong; /* 32 bits or more */
#else
typedef Byte FAR Bytef;
#endif
#else
typedef Byte FAR Bytef;
#endif
+#if defined(__VISAGECPP__)
+# define Bytef Byte FAR
+#endif
typedef char FAR charf;
typedef int FAR intf;
typedef uInt FAR uIntf;
typedef char FAR charf;
typedef int FAR intf;
typedef uInt FAR uIntf;