From 52a237592f87a8cd952dab84fb28625a49b5b574 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 13 Jan 2017 23:01:53 +0000 Subject: zlib/gzgut.h: do not define WIDECHAR for __CYGWIN__ (report from Luigi, David) git-svn-id: svn://tug.org/texlive/trunk@42941 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/zlib/zlib-PATCHES/ChangeLog | 5 +++++ .../zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin | 12 ++++++++++++ Build/source/libs/zlib/zlib-src/gzguts.h | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin (limited to 'Build') diff --git a/Build/source/libs/zlib/zlib-PATCHES/ChangeLog b/Build/source/libs/zlib/zlib-PATCHES/ChangeLog index 59ab3b865a7..31775dc1ecc 100644 --- a/Build/source/libs/zlib/zlib-PATCHES/ChangeLog +++ b/Build/source/libs/zlib/zlib-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2017-01-13 Akira Kakuto + + Add patch-01-not-define-WIDECHAR-for-cygwin, in order to not define + WIDECHAR for __CYGWIN__. Report from Luigi, David. + 2017-01-03 Akira Kakuto Import zlib-1.2.10. diff --git a/Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin b/Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin new file mode 100644 index 00000000000..5faf06ce055 --- /dev/null +++ b/Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin @@ -0,0 +1,12 @@ +diff -ur zlib-1.2.10.orig/gzguts.h zlib-1.2.10/gzguts.h +--- zlib-1.2.10.orig/gzguts.h Sun Jan 01 16:37:10 2017 ++++ zlib-1.2.10/gzguts.h Sat Jan 14 07:48:15 2017 +@@ -39,7 +39,7 @@ + # include + #endif + +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + # define WIDECHAR + #endif + diff --git a/Build/source/libs/zlib/zlib-src/gzguts.h b/Build/source/libs/zlib/zlib-src/gzguts.h index 990a4d25149..6378d468a25 100644 --- a/Build/source/libs/zlib/zlib-src/gzguts.h +++ b/Build/source/libs/zlib/zlib-src/gzguts.h @@ -39,7 +39,7 @@ # include #endif -#if defined(_WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) # define WIDECHAR #endif -- cgit v1.2.3