summaryrefslogtreecommitdiffstats
path: root/zlib
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowi@redhat.com>2017-03-14 23:01:23 -0600
committerJeff Law <law@gcc.gnu.org>2017-03-14 23:01:23 -0600
commit142b99a8888ddb6d67e74b63789983e804b5a732 (patch)
tree757c28ebc0ca0e0b4175c0528ab647a49a5861fd /zlib
parentre PR tree-optimization/79800 (wrong snprintf result range with precision in ... (diff)
downloadgcc-142b99a8888ddb6d67e74b63789983e804b5a732.tar.gz
gcc-142b99a8888ddb6d67e74b63789983e804b5a732.tar.bz2
gcc-142b99a8888ddb6d67e74b63789983e804b5a732.tar.xz
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
Diffstat (limited to 'zlib')
-rw-r--r--zlib/ChangeLog.gcj7
-rw-r--r--zlib/gzguts.h2
-rw-r--r--zlib/win32/zlib.def1
-rw-r--r--zlib/zlib.h2
4 files changed, 9 insertions, 3 deletions
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 47928119dfd..09bc9c26104 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,10 @@
12017-03-15 Yaakov Selkowitz <yselkowitz@redhat.com>
2
3 PR bootstrap/79771
4 * gzguts.h (WIDECHAR): Do not define for __CYGWIN__.
5 * zlib.h (gzopen_w): Do not declare for __CYGWIN__.
6 * win32/zlib.def: Remove gzopen_w.
7
12017-01-22 Matthias Klose <doko@ubuntu.com> 82017-01-22 Matthias Klose <doko@ubuntu.com>
2 9
3 * Import zlib 1.2.11. 10 * Import zlib 1.2.11.
diff --git a/zlib/gzguts.h b/zlib/gzguts.h
index 990a4d25149..6378d468a25 100644
--- a/zlib/gzguts.h
+++ b/zlib/gzguts.h
@@ -39,7 +39,7 @@
39# include <io.h> 39# include <io.h>
40#endif 40#endif
41 41
42#if defined(_WIN32) || defined(__CYGWIN__) 42#if defined(_WIN32)
43# define WIDECHAR 43# define WIDECHAR
44#endif 44#endif
45 45
diff --git a/zlib/win32/zlib.def b/zlib/win32/zlib.def
index 784b1386913..0cb3f5d48b9 100644
--- a/zlib/win32/zlib.def
+++ b/zlib/win32/zlib.def
@@ -91,4 +91,3 @@ EXPORTS
91 inflateCodesUsed 91 inflateCodesUsed
92 inflateResetKeep 92 inflateResetKeep
93 deflateResetKeep 93 deflateResetKeep
94 gzopen_w
diff --git a/zlib/zlib.h b/zlib/zlib.h
index f09cdaf1e05..49dfcece0e1 100644
--- a/zlib/zlib.h
+++ b/zlib/zlib.h
@@ -1893,7 +1893,7 @@ ZEXTERN int ZEXPORT inflateValidate OF((z_streamp, int));
1893ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp)); 1893ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp));
1894ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp)); 1894ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp));
1895ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); 1895ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp));
1896#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO) 1896#if defined(_WIN32) && !defined(Z_SOLO)
1897ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, 1897ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path,
1898 const char *mode)); 1898 const char *mode));
1899#endif 1899#endif