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/zlib.h | |
parent | a983542b60dc245aa37ac57a643389e7b2021f28 (diff) | |
download | gcc-142b99a8888ddb6d67e74b63789983e804b5a732.zip gcc-142b99a8888ddb6d67e74b63789983e804b5a732.tar.gz gcc-142b99a8888ddb6d67e74b63789983e804b5a732.tar.bz2 |
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/zlib.h')
-rw-r--r-- | zlib/zlib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zlib/zlib.h b/zlib/zlib.h index f09cdaf..49dfcec 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 |