diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2012-08-06 15:45:31 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 11:33:20 +0200 |
| commit | 85db2d113232fdfc315637f4b80b461419533bc5 (patch) | |
| tree | 7b6d9c047ad025461d3e293e4d5430d174af9029 /src/3rdparty/zlib/gzguts.h | |
| parent | a3feb25db13cfe979ad64c16ae0f0c30086ab2cb (diff) | |
| download | qtsvg-85db2d113232fdfc315637f4b80b461419533bc5.tar.gz | |
Fixed zlib build for WEC7.
errno in zutil.c is leftover, and not used anymore -> removed.
In gzguts.h qsvgfunctions_wince.h are included. To use this header
qglobal.h is needed.
qsqvgfunctions_wince.h and .cpp contains implementation for missing
wince functions etc.
Task-number: QTBUG-22507
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
This change is partially cherry picked from commit:
2fa9c829faae10f445fd580627114a8383b753ab
Change-Id: Ifef46ab829d12600b967cc3aa87fe2b8342b4f77
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/3rdparty/zlib/gzguts.h')
| -rw-r--r-- | src/3rdparty/zlib/gzguts.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/3rdparty/zlib/gzguts.h b/src/3rdparty/zlib/gzguts.h index 9f9640b..267770a 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 <qsvgfunctions_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 |