diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-01-13 23:01:53 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-01-13 23:01:53 +0000 |
| commit | 52a237592f87a8cd952dab84fb28625a49b5b574 (patch) | |
| tree | 11871f8592019266f029b34150548169a50b9498 /Build | |
| parent | 9ce254c8eb693b7714ee36c0bfe555f80c6afa09 (diff) | |
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
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/libs/zlib/zlib-PATCHES/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/libs/zlib/zlib-PATCHES/patch-01-not-define-WIDECHAR-for-cygwin | 12 | ||||
| -rw-r--r-- | Build/source/libs/zlib/zlib-src/gzguts.h | 2 |
3 files changed, 18 insertions, 1 deletions
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 <kakuto@fuk.kindai.ac.jp> + + 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 <kakuto@fuk.kindai.ac.jp> 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 <io.h> + #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 <io.h> #endif -#if defined(_WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) # define WIDECHAR #endif |