diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-22 13:58:27 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-22 13:58:27 (GMT) |
| commit | 22efbe7d4388787d3a9f2511cbf780d4ccc17c2f (patch) | |
| tree | 01f4522e86aa874eb3072237fe02cd2213ccae3d /src/3rdparty | |
| parent | 28cbbf0ce72b33a259f097a070571589e49f8923 (diff) | |
| parent | 66fb4038649cfd1d660204bf7c70f99a409ede4f (diff) | |
| download | Qt-22efbe7d4388787d3a9f2511cbf780d4ccc17c2f.zip Qt-22efbe7d4388787d3a9f2511cbf780d4ccc17c2f.tar.gz Qt-22efbe7d4388787d3a9f2511cbf780d4ccc17c2f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/libpng/png.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/libpng/pngpriv.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/libpng/png.h b/src/3rdparty/libpng/png.h index 14e3416..5ea2b0d 100644 --- a/src/3rdparty/libpng/png.h +++ b/src/3rdparty/libpng/png.h @@ -386,7 +386,7 @@ #include "zlib.h" #endif -#ifdef AIX +#ifdef _AIX #define jmpbuf __jmpbuf #endif diff --git a/src/3rdparty/libpng/pngpriv.h b/src/3rdparty/libpng/pngpriv.h index 13c2b3f..87a4ba6 100644 --- a/src/3rdparty/libpng/pngpriv.h +++ b/src/3rdparty/libpng/pngpriv.h @@ -74,7 +74,9 @@ #if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \ defined(_WIN32) || defined(__WIN32__) -# include <windows.h> /* defines _WINDOWS_ macro */ +# if !defined(__SYMBIAN32__) +# include <windows.h> /* defines _WINDOWS_ macro */ +# endif /* I have no idea why is this necessary... */ # ifdef _MSC_VER # include <malloc.h> |