diff options
Diffstat (limited to 'src/3rdparty/zlib')
| -rw-r--r-- | src/3rdparty/zlib/0001-Fix-WEC2013-build-of-zlib.patch | 26 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zutil.h | 2 |
2 files changed, 27 insertions, 1 deletions
diff --git a/src/3rdparty/zlib/0001-Fix-WEC2013-build-of-zlib.patch b/src/3rdparty/zlib/0001-Fix-WEC2013-build-of-zlib.patch new file mode 100644 index 0000000000..ef6fb33eed --- /dev/null +++ b/src/3rdparty/zlib/0001-Fix-WEC2013-build-of-zlib.patch @@ -0,0 +1,26 @@ +From f2652cfd83f34ec3e70a936e5ea9f8623b66bd95 Mon Sep 17 00:00:00 2001 +From: Bjoern Breitmeyer <bjoern.breitmeyer@kdab.com> +Date: Fri, 27 Mar 2015 15:46:59 +0100 +Subject: [PATCH] Fix WEC2013 build of zlib. + +Change-Id: I4d1908f1175ed39e2df8717fb0b5a17befe88744 +--- + src/3rdparty/zlib/zutil.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h +index 8e535ac..4d367a9 100644 +--- a/src/3rdparty/zlib/zutil.h ++++ b/src/3rdparty/zlib/zutil.h +@@ -143,7 +143,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ + #endif + + #if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX +-# if defined(_WIN32_WCE) ++# if defined(_WIN32_WCE) && _WIN32_WCE < 0x800 + # define fdopen(fd,mode) NULL /* No fdopen() */ + # ifndef _PTRDIFF_T_DEFINED + typedef int ptrdiff_t; +-- +1.8.1.msysgit.1 + diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h index 8e535acf40..4d367a92db 100644 --- a/src/3rdparty/zlib/zutil.h +++ b/src/3rdparty/zlib/zutil.h @@ -143,7 +143,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif #if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX -# if defined(_WIN32_WCE) +# if defined(_WIN32_WCE) && _WIN32_WCE < 0x800 # define fdopen(fd,mode) NULL /* No fdopen() */ # ifndef _PTRDIFF_T_DEFINED typedef int ptrdiff_t; |