From 701ba023a2d047ef27befc800c428b1dbcf13cff Mon Sep 17 00:00:00 2001 From: Bjoern Breitmeyer Date: Mon, 7 Oct 2013 14:17:00 +0200 Subject: Fixes windows ce build The windows file seems to handle ce too in the new version of libtiff. Only the 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 --- src/3rdparty/libtiff.pri | 2 +- src/3rdparty/libtiff/libtiff/tif_win32.c | 2 -- 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 +# ifdef Q_OS_WINCE +# include +# else +# include +# endif #endif #ifdef HAVE_STRING_H -- cgit v1.2.3