aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2012-03-17 21:42:30 -0700
committerMark Adler <madler@alumni.caltech.edu>2012-03-17 21:45:01 -0700
commita1af6e96e35dfc3adfa2acba01883c14115f1090 (patch)
treea89ce1ad75505f2f4167ddb1f5b4c47a0b8150c3
parent2c42538c2e420d9abaf7c6f2929c4b05d6c440b3 (diff)
downloadzlib-a1af6e96e35dfc3adfa2acba01883c14115f1090.tar.gz
zlib-a1af6e96e35dfc3adfa2acba01883c14115f1090.tar.bz2
zlib-a1af6e96e35dfc3adfa2acba01883c14115f1090.zip
Fix gzopen_w() type and add #include for the type.
-rw-r--r--gzguts.h4
-rw-r--r--gzlib.c2
-rw-r--r--zlib.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/gzguts.h b/gzguts.h
index 13e8179..ee3f281 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -27,6 +27,10 @@
27#endif 27#endif
28#include <fcntl.h> 28#include <fcntl.h>
29 29
30#ifdef _WIN32
31# include <stddef.h>
32#endif
33
30#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) 34#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
31# include <io.h> 35# include <io.h>
32#endif 36#endif
diff --git a/gzlib.c b/gzlib.c
index e90b6ad..b99c26c 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -275,7 +275,7 @@ gzFile ZEXPORT gzdopen(fd, mode)
275/* -- see zlib.h -- */ 275/* -- see zlib.h -- */
276#ifdef _WIN32 276#ifdef _WIN32
277gzFile ZEXPORT gzopen_w(path, mode) 277gzFile ZEXPORT gzopen_w(path, mode)
278 const w_char *path; 278 const wchar_t *path;
279 const char *mode; 279 const char *mode;
280{ 280{
281 return gz_open(path, -2, mode); 281 return gz_open(path, -2, mode);
diff --git a/zlib.h b/zlib.h
index 361d72f..901339c 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1733,7 +1733,7 @@ ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int));
1733ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); 1733ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp));
1734ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); 1734ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp));
1735#if defined(_WIN32) && !defined(Z_SOLO) 1735#if defined(_WIN32) && !defined(Z_SOLO)
1736ZEXTERN gzFile ZEXPORT gzopen_w OF((const w_char *path, 1736ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path,
1737 const char *mode)); 1737 const char *mode));
1738#endif 1738#endif
1739 1739