From cdfc8773f242c04eaca72b07968414e3a36121b1 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 14 Jun 2018 14:57:08 +0100 Subject: [PATCH] extern: workaround zlib issue on cygwin --- extern/zlib/gzguts.h | 2 +- extern/zlib/zlib.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extern/zlib/gzguts.h b/extern/zlib/gzguts.h index 990a4d2514..6378d468a2 100644 --- a/extern/zlib/gzguts.h +++ b/extern/zlib/gzguts.h @@ -39,7 +39,7 @@ # include #endif -#if defined(_WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) # define WIDECHAR #endif diff --git a/extern/zlib/zlib.h b/extern/zlib/zlib.h index f09cdaf1e0..49dfcece0e 100644 --- a/extern/zlib/zlib.h +++ b/extern/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