diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-15 20:38:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-15 20:38:23 +0100 |
| commit | a10fec1d386efd99f95973c7d446f94622a5da56 (patch) | |
| tree | 688ad811c51ae0793f43010321c807d533425f45 /src/3rdparty/libtiff/libtiff/tiffiop.h | |
| parent | 9839bdba39d7f96de11071b9c6ab4c9c6635a976 (diff) | |
| parent | 54cdb5b07b2ae2130ce73c6bb22c65b4ad1cba03 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: If4baad0b1949c1c8f7157c213fc492775053ae0b
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tiffiop.h')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tiffiop.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tiffiop.h b/src/3rdparty/libtiff/libtiff/tiffiop.h index 4da486b..daa291c 100644 --- a/src/3rdparty/libtiff/libtiff/tiffiop.h +++ b/src/3rdparty/libtiff/libtiff/tiffiop.h @@ -37,11 +37,7 @@ #endif #ifdef HAVE_SYS_TYPES_H -# ifdef Q_OS_WINCE -# include <types.h> -# else -# include <sys/types.h> -# endif +# include <sys/types.h> #endif #ifdef HAVE_STRING_H |