Compile fixes for the const patch

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

diff --git a/src/zlib/zutil.h b/src/zlib/zutil.h
index 7b42edcaa9842edaaa2bbf3bf672bcadab4514e3..b7d5eff81b69a3c23daec86c42dff4ba4746b1dd 100644 (file)
--- a/src/zlib/zutil.h
+++ b/src/zlib/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
 /* zutil.h -- internal interface and configuration of the compression library

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


@@ -17,14 +17,26 @@
 #include "zlib.h"
 
 #ifdef STDC
 #include "zlib.h"
 
 #ifdef STDC

-#  include <stddef.h>
+#  ifndef _WIN32_WCE
+#    include <stddef.h>
+#  endif

 #  include <string.h>
 #  include <stdlib.h>
 #endif
 #ifdef NO_ERRNO_H
 #  include <string.h>
 #  include <stdlib.h>
 #endif
 #ifdef NO_ERRNO_H

+#   ifdef _WIN32_WCE
+      /* The Microsoft C Run-Time Library for Windows CE doesn't have
+       * errno.  We define it as a global variable to simplify porting.
+       * Its value is always 0 and should not be used.  We rename it to
+       * avoid conflict with other libraries that use the same workaround.
+       */
+#     define errno z_errno
+#   endif

     extern int errno;
 #else
     extern int errno;
 #else

-#   include <errno.h>
+#  ifndef _WIN32_WCE
+#    include <errno.h>
+#  endif

 #endif
 
 #ifndef local
 #endif
 
 #ifndef local


@@ -105,6 +117,9 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #ifdef OS2
 #  define OS_CODE  0x06
 
 #ifdef OS2
 #  define OS_CODE  0x06

+#  ifdef M_I86
+     #include <malloc.h>
+#  endif

 #endif
 
 #if defined(MACOS) || defined(TARGET_OS_MAC)
 #endif
 
 #if defined(MACOS) || defined(TARGET_OS_MAC)


@@ -193,15 +208,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define NO_vsnprintf
 #endif
 
 #  define NO_vsnprintf
 #endif
 

-#ifdef HAVE_STRERROR
-#  ifndef VMS
-     extern char *strerror OF((int));
-#  endif
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-

 #if defined(pyr)
 #  define NO_MEMCPY
 #endif
 #if defined(pyr)
 #  define NO_MEMCPY
 #endif