From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 16 Jan 2017 17:38:36 +0000 (-0800)
Subject: Cygwin does not have _wopen(), so do not create gzopen_w() there.
X-Git-Tag: 1.9.9-b1~576
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec85a0a5568712d2654fabe8dd3432bf8389349a;p=thirdparty%2Fzlib-ng.git

Cygwin does not have _wopen(), so do not create gzopen_w() there.
---

diff --git a/gzguts.h b/gzguts.h
index 6e84adb7..c32b6320 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -42,7 +42,7 @@
 #  include <io.h>
 #endif
 
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__)
+#if defined(_WIN32) || defined(__MINGW__)
 #  define WIDECHAR
 #endif
 
diff --git a/zlib-ng.h b/zlib-ng.h
index ebd453df..3a52d1f2 100644
--- a/zlib-ng.h
+++ b/zlib-ng.h
@@ -1828,7 +1828,7 @@ ZEXTERN int              ZEXPORT zng_inflateResetKeep (zng_stream *);
 ZEXTERN int              ZEXPORT zng_deflateResetKeep (zng_stream *);
 
 #ifdef WITH_GZFILEOP
-# if (defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW__))
+# if (defined(WIN32) || defined(__MINGW__))
     ZEXTERN gzFile ZEXPORT zng_gzopen_w(const wchar_t *path, const char *mode);
 # endif
 ZEXTERN int ZEXPORTVA zng_gzvprintf(gzFile file, const char *format, va_list va);
diff --git a/zlib.h b/zlib.h
index e48e927c..afe71ea1 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1835,7 +1835,7 @@ ZEXTERN unsigned long    ZEXPORT inflateCodesUsed (z_stream *);
 ZEXTERN int              ZEXPORT inflateResetKeep (z_stream *);
 ZEXTERN int              ZEXPORT deflateResetKeep (z_stream *);
 
-#if (defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW__))
+#if (defined(WIN32) || defined(__MINGW__))
     ZEXTERN gzFile ZEXPORT gzopen_w(const wchar_t *path, const char *mode);
 #endif
 ZEXTERN int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va);