diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 23:00:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 23:00:07 (GMT) |
| commit | d2aae57c1c2761848adaa19501ac83c7e2f8f7a0 (patch) | |
| tree | bcbd1c7b9c5737987355aa84f6dc0acdf0544658 | |
| parent | ef30a6f336d55c813423bf139d8363f50181179f (diff) | |
| parent | e8aefb6bb44285a15cf47b38f3412b9eaa8139e9 (diff) | |
| download | Qt-d2aae57c1c2761848adaa19501ac83c7e2f8f7a0.zip Qt-d2aae57c1c2761848adaa19501ac83c7e2f8f7a0.tar.gz Qt-d2aae57c1c2761848adaa19501ac83c7e2f8f7a0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
WinCE compilation fix
| -rw-r--r-- | src/3rdparty/libpng/pngconf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h index 5d202db..1f8bef8 100644 --- a/src/3rdparty/libpng/pngconf.h +++ b/src/3rdparty/libpng/pngconf.h @@ -1379,7 +1379,7 @@ typedef char FAR * FAR * FAR * png_charppp; /* memory model/platform independent fns */ #ifndef PNG_ABORT -# ifdef _WINDOWS_ +# if defined(_WINDOWS_) || defined(_WIN32_WCE) # define PNG_ABORT() ExitProcess(0) # else # define PNG_ABORT() abort() |