diff options
| author | Bjoern Breitmeyer <bjoern.breitmeyer@kdab.com> | 2013-10-07 14:17:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-07 14:39:23 +0200 |
| commit | 701ba023a2d047ef27befc800c428b1dbcf13cff (patch) | |
| tree | b85b66b0106f74dbcba4f675aca7ba5d981b0af7 | |
| parent | 82b7b9d3dc9e1eeff305a3e53e618d3413be123d (diff) | |
Fixes windows ce buildv5.2.0-beta1
The windows file seems to handle ce too in the new
version of libtiff. Only the <sys/types> include
and the not defined error handle were a problem.
The error handler ifndef _WIN32_WCE can be removed
as Qt builds libtiff without the gui integration.
Change-Id: Idb025f64fc31d580566d8ce248137e57d01e96b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/3rdparty/libtiff.pri | 2 | ||||
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_win32.c | 2 | ||||
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tiffiop.h | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/3rdparty/libtiff.pri b/src/3rdparty/libtiff.pri index 3479d85..bc97ee9 100644 --- a/src/3rdparty/libtiff.pri +++ b/src/3rdparty/libtiff.pri @@ -34,7 +34,7 @@ SOURCES += \ $$PWD/libtiff/libtiff/tif_write.c \ $$PWD/libtiff/libtiff/tif_zip.c -wince*: SOURCES += $$PWD/libtiff/libtiff/tif_wince.c +wince*: SOURCES += $$PWD/libtiff/libtiff/tif_win32.c win32: SOURCES += $$PWD/libtiff/libtiff/tif_win32.c else: SOURCES += $$PWD/libtiff/libtiff/tif_unix.c android: SOURCES += $$PWD/libtiff/port/lfind.c diff --git a/src/3rdparty/libtiff/libtiff/tif_win32.c b/src/3rdparty/libtiff/libtiff/tif_win32.c index 2cf1de9..5fa828f 100644 --- a/src/3rdparty/libtiff/libtiff/tif_win32.c +++ b/src/3rdparty/libtiff/libtiff/tif_win32.c @@ -362,7 +362,6 @@ _TIFFmemcmp(const void* p1, const void* p2, tmsize_t c) return (memcmp(p1, p2, (size_t) c)); } -#ifndef _WIN32_WCE #if (_MSC_VER < 1500) # define vsnprintf _vsnprintf @@ -428,7 +427,6 @@ Win32ErrorHandler(const char* module, const char* fmt, va_list ap) } TIFFErrorHandler _TIFFerrorHandler = Win32ErrorHandler; -#endif /* ndef _WIN32_WCE */ /* vim: set ts=8 sts=8 sw=8 noet: */ /* diff --git a/src/3rdparty/libtiff/libtiff/tiffiop.h b/src/3rdparty/libtiff/libtiff/tiffiop.h index 53357d8..916c998 100644 --- a/src/3rdparty/libtiff/libtiff/tiffiop.h +++ b/src/3rdparty/libtiff/libtiff/tiffiop.h @@ -37,7 +37,11 @@ #endif #ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> +# ifdef Q_OS_WINCE +# include <types.h> +# else +# include <sys/types.h> +# endif #endif #ifdef HAVE_STRING_H |