Fix z_size_t definition:

- Zlib Compat: Move definition of z_size_t to zconf.h, so it is exported to applications.
               Always defined as size_t to follow zlib 1.2.13 behavior with STDC compilers.
- Zlib-NG: Keeps internal definition of z_size_t in zbuild.h

diff --git a/zbuild.h b/zbuild.h
index 27f784a99f152fe866880e799283d32ca8e95a0a..525a34d8d8452200aec74af90a7b5623fc8f09f5 100644 (file)
--- a/zbuild.h
+++ b/zbuild.h
@@ -88,11 +88,6 @@
 #  define PREFIX3(x) z_ ## x
 #  define PREFIX4(x) x ## 64
 #  define zVersion zlibVersion
-#  if defined(_WIN64)
-#    define z_size_t unsigned __int64
-#  else
-#    define z_size_t unsigned long
-#  endif
 #else
 #  define PREFIX(x) zng_ ## x
 #  define PREFIX2(x) ZLIBNG_ ## x

diff --git a/zconf.h.in b/zconf.h.in
index 765e9c4e47308a6e2cf6fa340bbf9e5e1a1ec946..18c405e8f7032a4bf3fa3079d5fe82a5ed943a64 100644 (file)
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -25,6 +25,8 @@
 #  define z_const
 #endif
 
+typedef size_t z_size_t;
+
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
 #  define MAX_MEM_LEVEL 9