OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Yaakov Selkowitz 2017-03-14 23:01:23 -06:00 committed by Jeff Law
parent a983542b60
commit 142b99a888
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zlib/ChangeLog.gcj
View File

@ -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> 2017-01-22 Matthias Klose <doko@ubuntu.com>
* Import zlib 1.2.11. * Import zlib 1.2.11.

2
zlib/gzguts.h
View File

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

1
zlib/win32/zlib.def
View File

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

2
zlib/zlib.h
View File

@ -1893,7 +1893,7 @@ ZEXTERN int ZEXPORT inflateValidate OF((z_streamp, int));
ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp)); ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp));
ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp));
ZEXTERN int ZEXPORT deflateResetKeep 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, ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path,
const char *mode)); const char *mode));
#endif #endif