From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 18 Mar 2012 04:42:30 +0000 (-0700)
Subject: Fix gzopen_w() type and add #include for the type.
X-Git-Tag: v1.2.7~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1af6e96e35dfc3adfa2acba01883c14115f1090;p=thirdparty%2Fzlib-ng.git

Fix gzopen_w() type and add #include for the type.
---

diff --git a/gzguts.h b/gzguts.h
index 13e81791e..ee3f281aa 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -27,6 +27,10 @@
 #endif
 #include <fcntl.h>
 
+#ifdef _WIN32
+#  include <stddef.h>
+#endif
+
 #if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
 #  include <io.h>
 #endif
diff --git a/gzlib.c b/gzlib.c
index e90b6adb0..b99c26c7b 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -275,7 +275,7 @@ gzFile ZEXPORT gzdopen(fd, mode)
 /* -- see zlib.h -- */
 #ifdef _WIN32
 gzFile ZEXPORT gzopen_w(path, mode)
-    const w_char *path;
+    const wchar_t *path;
     const char *mode;
 {
     return gz_open(path, -2, mode);
diff --git a/zlib.h b/zlib.h
index 361d72f5d..901339c57 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1733,7 +1733,7 @@ ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
 #if defined(_WIN32) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const w_char *path,
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                             const char *mode));
 #endif