diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2017-03-14 23:01:23 -0600 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2017-03-14 23:01:23 -0600 |
| commit | 142b99a8888ddb6d67e74b63789983e804b5a732 (patch) | |
| tree | 757c28ebc0ca0e0b4175c0528ab647a49a5861fd /zlib | |
| parent | a983542b60dc245aa37ac57a643389e7b2021f28 (diff) | |
| download | gcc-142b99a8888ddb6d67e74b63789983e804b5a732.tar.gz | |
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.gcj | 7 | ||||
| -rw-r--r-- | zlib/gzguts.h | 2 | ||||
| -rw-r--r-- | zlib/win32/zlib.def | 1 | ||||
| -rw-r--r-- | zlib/zlib.h | 2 |
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 @@ +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 990a4d25149..6378d468a25 100644 --- 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 784b1386913..0cb3f5d48b9 100644 --- a/zlib/win32/zlib.def +++ b/zlib/win32/zlib.def @@ -91,4 +91,3 @@ EXPORTS inflateCodesUsed
inflateResetKeep
deflateResetKeep
- 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)); 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 |