warning fixes

[wxWidgets.git] / src / zlib / zconf.h

diff --git a/src/zlib/zconf.h b/src/zlib/zconf.h
index 8739a450de2f9ae593960d85e272c369782ac1e9..3a1c213a030f9656611d3328aff2594393e18b7b 100644 (file)
--- a/src/zlib/zconf.h
+++ b/src/zlib/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
 /* zconf.h -- configuration of the zlib compression library

- * Copyright (C) 1995-1998 Jean-loup Gailly.
+ * Copyright (C) 1995-2002 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
  */
 


@@ -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,26 +173,51 @@
 #  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 */
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */

 #  define Bytef Byte FAR
 #else
    typedef Byte  FAR Bytef;
 #  define Bytef Byte FAR
 #else
    typedef Byte  FAR Bytef;


@@ -220,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