re PR bootstrap/79771 (in-tree zlib breaks build)

2017-03-15  Yaakov Selkowitz <yselkowitz@redhat.com>

	PR bootstrap/79771
	* gzguts.h (WIDECHAR): Do not define for __CYGWIN__.
	* zlib.h (gzopen_w): Do not declare for __CYGWIN__.
	* win32/zlib.def: Remove gzopen_w.

From-SVN: r246152

diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 47928119dfd8c8cef561743017195facd29c3abd..09bc9c26104ce052372679e895cd5eb83e65a167 100644 (file)
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,10 @@
+2017-03-15  Yaakov Selkowitz <yselkowitz@redhat.com>
+
+       PR bootstrap/79771
+       * gzguts.h (WIDECHAR): Do not define for __CYGWIN__.
+       * zlib.h (gzopen_w): Do not declare for __CYGWIN__.
+       * win32/zlib.def: Remove gzopen_w.
+               
 2017-01-22  Matthias Klose  <doko@ubuntu.com>
 
        * Import zlib 1.2.11.

diff --git a/zlib/gzguts.h b/zlib/gzguts.h
index 990a4d2514933709883a7d949ed52146675fe2c1..6378d468a258b134420c2434f62de8f0d3fb42ea 100644 (file)
--- a/zlib/gzguts.h
+++ b/zlib/gzguts.h
@@ -39,7 +39,7 @@
 #  include <io.h>
 #endif
 
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
 #  define WIDECHAR
 #endif
 

diff --git a/zlib/win32/zlib.def b/zlib/win32/zlib.def
index 784b138691385c3e6ba13f8270888ccf7cee90a6..0cb3f5d48b9f53ebe8a0563cdc800d26cf3d3e75 100644 (file)
--- a/zlib/win32/zlib.def
+++ b/zlib/win32/zlib.def
@@ -91,4 +91,3 @@ EXPORTS
     inflateCodesUsed\r
     inflateResetKeep\r
     deflateResetKeep\r
-    gzopen_w\r

diff --git a/zlib/zlib.h b/zlib/zlib.h
index f09cdaf1e0543de911d8220befdb51fa8632a9e6..49dfcece0e1f9a5ccf5298a633045a7bcfb1bf25 100644 (file)
--- a/zlib/zlib.h
+++ b/zlib/zlib.h
@@ -1893,7 +1893,7 @@ ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
 ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
+#if defined(_WIN32) && !defined(Z_SOLO)
 ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                             const char *mode));
 #endif