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

zlib/ChangeLog.gcj

+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.

zlib/gzguts.h

@@ -39,7 +39,7 @@
 #  include <io.h>
 #endif
 
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
 #  define WIDECHAR
 #endif
 

zlib/win32/zlib.def

@@ -91,4 +91,3 @@ EXPORTS
     inflateCodesUsed
     inflateResetKeep
     deflateResetKeep
-    gzopen_w

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