[OpenWrt-Devel,5/8] tools/zlib: add cygwin compatibility
diff mbox series

Message ID 20191008010225.8822-5-rosenp@gmail.com
State Rejected
Delegated to: Petr Štetiar
Headers show
Series
  • [OpenWrt-Devel,1/8] ncurses: add cygwin compatibility
Related show

Commit Message

Rosen Penev Oct. 8, 2019, 1:02 a.m. UTC
From: Alexey Loukianov <lx2@lexa2.ru>

Incorporate CYGWIN zlib patches into package.

Signed-off-by: Alexey Loukianov <lx2@lexa2.ru>
(replaced patch with upstream backport)
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 tools/zlib/patches/010-cygwin.patch | 37 +++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 tools/zlib/patches/010-cygwin.patch

Patch
diff mbox series

diff --git a/tools/zlib/patches/010-cygwin.patch b/tools/zlib/patches/010-cygwin.patch
new file mode 100644
index 0000000000..f6b21dbae0
--- /dev/null
+++ b/tools/zlib/patches/010-cygwin.patch
@@ -0,0 +1,37 @@ 
+From 5ff989033e8b839b80ce716a1452acf7664e2ff4 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Mon, 16 Jan 2017 09:38:36 -0800
+Subject: [PATCH] Cygwin does not have _wopen(), so do not create gzopen_w()
+ there.
+
+---
+ gzguts.h | 2 +-
+ zlib.h   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gzguts.h b/gzguts.h
+index 990a4d25..6378d468 100644
+--- a/gzguts.h
++++ b/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.h b/zlib.h
+index 21636c25..5daf4f28 100644
+--- a/zlib.h
++++ b/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