diff options
Diffstat (limited to 'src/3rdparty/zlib')
-rw-r--r-- | src/3rdparty/zlib/gzguts.h | 9 | ||||
-rw-r--r-- | src/3rdparty/zlib/zutil.c | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h index c752b5763b..26b4d37c1d 100644 --- a/src/3rdparty/zlib/gzguts.h +++ b/src/3rdparty/zlib/gzguts.h @@ -32,7 +32,10 @@ # include <limits.h> #endif #if !defined(_WIN32_WCE) -#include <fcntl.h> +# include <fcntl.h> +#else +# include <qglobal.h> +# include <qfunctions_wince.h> #endif #ifdef NO_DEFLATE /* for compatibility with old definition */ @@ -40,7 +43,9 @@ #endif #ifdef _MSC_VER -# include <io.h> +# if !defined(_WIN32_WCE) +# include <io.h> +# endif # define vsnprintf _vsnprintf #endif diff --git a/src/3rdparty/zlib/zutil.c b/src/3rdparty/zlib/zutil.c index 898ed345b0..3418c5999f 100644 --- a/src/3rdparty/zlib/zutil.c +++ b/src/3rdparty/zlib/zutil.c @@ -136,14 +136,6 @@ const char * ZEXPORT zError(err) return ERR_MSG(err); } -#if defined(_WIN32_WCE) - /* The Microsoft C Run-Time Library for Windows CE doesn't have - * errno. We define it as a global variable to simplify porting. - * Its value is always 0 and should not be used. - */ - int errno = 0; -#endif - #ifndef HAVE_MEMCPY void ZLIB_INTERNAL zmemcpy(dest, source, len) |