diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:15:22 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:15:22 +0200 |
commit | 842cad24b4b274e8738ecd9e4e105a52f7b2ec0d (patch) | |
tree | 5523fbcb7c5943b4a5d483d14fa2d08cf7d3533a | |
parent | 5f5f95350568d0b38264b502f2181712733dc121 (diff) | |
parent | 701ba023a2d047ef27befc800c428b1dbcf13cff (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I89d0db8f8928e8763b3a9e6fa9ae1cda6e18a76f
-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 |