summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorAndreas Holzammer <andreas.holzammer@kdab.com>2012-02-10 10:27:00 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-27 08:07:19 (GMT)
commit2fa9c829faae10f445fd580627114a8383b753ab (patch)
treece145af492550fc9a006e497c46fe6d70dc6b9d9 /src/3rdparty
parent203a8d8333c8be8412289537efd490b8da0425b2 (diff)
downloadQt-2fa9c829faae10f445fd580627114a8383b753ab.zip
Qt-2fa9c829faae10f445fd580627114a8383b753ab.tar.gz
Qt-2fa9c829faae10f445fd580627114a8383b753ab.tar.bz2
Fixed zlib build for WEC7.
errno in zutil.c is leftover, and not used anymore -> removed. In gzguts.h qfunctions_wince.h are included. To use this header qglobal.h is needed. In qfunctions_wince.h a special define section is added for zlib. Task-number: QTBUG-22507 Change-Id: I78ec78d22e2930a03b349a47ab3a3ad077277c42 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 10830e844683c75d96c024450b4b7a624d8d6d8f) Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/zlib/gzguts.h9
-rw-r--r--src/3rdparty/zlib/zutil.c8
2 files changed, 7 insertions, 10 deletions
diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h
index 9f9640b..9e4368e 100644
--- a/src/3rdparty/zlib/gzguts.h
+++ b/src/3rdparty/zlib/gzguts.h
@@ -36,7 +36,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 */
@@ -44,7 +47,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 898ed34..3418c59 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)