From 32ae837d333bfeab34bbb3bbfac90eb0c78ada6f Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Thu, 13 Oct 2005 16:12:18 +0000
Subject: Updating zlib to 1.2.3.

---
 lib/zlib/include/zconf.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'lib/zlib/include/zconf.h')

diff --git a/lib/zlib/include/zconf.h b/lib/zlib/include/zconf.h
index f21b0a3..68d1a67 100644
--- a/lib/zlib/include/zconf.h
+++ b/lib/zlib/include/zconf.h
@@ -1,9 +1,9 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2004 Jean-loup Gailly.
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: zconf.h,v 1.4 2005-06-06 11:16:15 pixel Exp $ */
+/* @(#) $Id: zconf.h,v 1.5 2005-10-13 16:12:18 pixel Exp $ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
@@ -43,6 +43,10 @@
 #  define get_crc_table         z_get_crc_table
 #  define zError                z_zError
 
+#  define alloc_func            z_alloc_func
+#  define free_func             z_free_func
+#  define in_func               z_in_func
+#  define out_func              z_out_func
 #  define Byte                  z_Byte
 #  define uInt                  z_uInt
 #  define uLong                 z_uLong
@@ -64,8 +68,10 @@
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
 #endif
 #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
 #  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-- 
cgit v1.2.3