diff options
| author | aavit <qt-info@nokia.com> | 2011-04-01 13:14:45 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-04-01 13:14:45 (GMT) |
| commit | 248d2c47d6166b7384db40ae0f352de67acd0a86 (patch) | |
| tree | 6e8c6d83df25f4e085548a68540d75ce2ad21647 /src/3rdparty | |
| parent | 0c214f948cf3520b42bc0d3f1adaa284dc2f3880 (diff) | |
| download | Qt-248d2c47d6166b7384db40ae0f352de67acd0a86.zip Qt-248d2c47d6166b7384db40ae0f352de67acd0a86.tar.gz Qt-248d2c47d6166b7384db40ae0f352de67acd0a86.tar.bz2 | |
Fix compilation of libtiff with zlib 1.2.5
Configuration wrongly claimed to have unistd.h also on Windows, and
the new zlib.h incidentally checks for the same #define symbol.
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h index 6d89e71..f851384 100644 --- a/src/3rdparty/libtiff/libtiff/tif_config.h +++ b/src/3rdparty/libtiff/libtiff/tif_config.h @@ -160,7 +160,9 @@ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the <unistd.h> header file. */ +#if !defined(Q_OS_WIN) #define HAVE_UNISTD_H 1 +#endif /* Define to 1 if you have the <windows.h> header file. */ /* #undef HAVE_WINDOWS_H */ |