projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GetMenuBar() now traverses up the hierarchy so it no longer has to be done here.
[wxWidgets.git]
/
src
/
zlib
/
zconf.h
diff --git
a/src/zlib/zconf.h
b/src/zlib/zconf.h
index 89e1a16c0d347fb63ee4cb9e36b550ebd3faffb9..3a1c213a030f9656611d3328aff2594393e18b7b 100644
(file)
--- a/
src/zlib/zconf.h
+++ b/
src/zlib/zconf.h
@@
-1,6
+1,6
@@
/* zconf.h -- configuration of the zlib compression library
/* 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
+ * Copyright (C) 1995-
2002
Jean-loup Gailly.
+ * 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__)
@@
-87,12
+87,12
@@
#endif
/* Some Mac compilers merge all .h files incorrectly: */
#endif
/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||
defined(__SC__
)
+#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||
(defined(__SC__) && !defined(__DMC__)
)
# define NO_DUMMY_DECL
#endif
# define NO_DUMMY_DECL
#endif
-/* Borland C incorrectly complains about missing returns: */
-#if defined(__BORLANDC__)
+/*
Old
Borland C incorrectly complains about missing returns: */
+#if defined(__BORLANDC__)
&& (__BORLANDC__ < 0x500)
# define NEED_DUMMY_RETURN
#endif
# define NEED_DUMMY_RETURN
#endif
@@
-148,7
+148,7
@@
/* MSC small or medium model */
# define SMALL_MEDIUM
# ifdef _MSC_VER
/* MSC small or medium model */
# define SMALL_MEDIUM
# ifdef _MSC_VER
-# define FAR _
_
far
+# define FAR _far
# else
# define FAR far
# endif
# else
# define FAR far
# endif
@@
-156,12
+156,13
@@
#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
# ifndef __32BIT__
# define SMALL_MEDIUM
#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
# ifndef __32BIT__
# define SMALL_MEDIUM
-# define FAR _
_
far
+# define FAR _far
# endif
#endif
/* Compile with -DZLIB_DLL for Windows DLL support */
# endif
#endif
/* Compile with -DZLIB_DLL for Windows DLL support */
-#if (defined(_WINDOWS) || defined(WINDOWS)) && defined(ZLIB_DLL)
+#if defined(ZLIB_DLL)
+# if defined(_WINDOWS) || defined(WINDOWS)
# ifdef FAR
# undef FAR
# endif
# ifdef FAR
# undef FAR
# endif
@@
-172,30
+173,58
@@
# else
# define ZEXPORTVA FAR _cdecl _export
# endif
# else
# define ZEXPORTVA FAR _cdecl _export
# endif
+# endif
+# if defined (__BORLANDC__)
+# if (__BORLANDC__ >= 0x0500) && defined (WIN32)
+# include <windows.h>
+# define ZEXPORT __declspec(dllexport) WINAPI
+# define ZEXPORTRVA __declspec(dllexport) WINAPIV
#else
#else
-#
if defined (__BORLANDC__) &&
defined (_Windows) && defined (__DLL__)
+#
if
defined (_Windows) && defined (__DLL__)
# define ZEXPORT _export
# define ZEXPORTVA _export
# define ZEXPORT _export
# define ZEXPORTVA _export
+# endif
+# endif
+# endif
+#endif
+
+#if defined (__BEOS__)
+# if defined (ZLIB_DLL)
+# define ZEXTERN extern __declspec(dllexport)
# else
# else
+# define ZEXTERN extern __declspec(dllimport)
+# endif
+#endif
+
+#ifndef ZEXPORT
# define ZEXPORT
# define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
# define ZEXPORTVA
# endif
# define ZEXPORTVA
# endif
+#ifndef ZEXTERN
+# define ZEXTERN extern
#endif
#ifndef FAR
# define FAR
#endif
#endif
#ifndef FAR
# define FAR
#endif
+#if !defined(MACOS) && !defined(TARGET_OS_MAC)
typedef unsigned char Byte; /* 8 bits */
typedef unsigned char Byte; /* 8 bits */
+#endif
typedef unsigned int uInt; /* 16 bits or more */
typedef unsigned long uLong; /* 32 bits or more */
typedef unsigned int uInt; /* 16 bits or more */
typedef unsigned long uLong; /* 32 bits or more */
-#if
defined(__BORLANDC__) && defined(SMALL_MEDIUM)
- /* Borland C/C++
ignores
FAR inside typedef */
+#if
def SMALL_MEDIUM
+ /* Borland C/C++
and some old MSC versions ignore
FAR inside typedef */
# define Bytef Byte FAR
#else
typedef Byte FAR Bytef;
#endif
# define Bytef Byte FAR
#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;
@@
-217,6
+246,7
@@
typedef uLong FAR uLongf;
#ifndef SEEK_SET
# define SEEK_SET 0 /* Seek from beginning of file. */
# define SEEK_CUR 1 /* Seek from current position. */
#ifndef SEEK_SET
# define SEEK_SET 0 /* Seek from beginning of file. */
# define SEEK_CUR 1 /* Seek from current position. */
+# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
#endif
#ifndef z_off_t
# define z_off_t long
#endif
#ifndef z_off_t
# define z_off_t long