From 248d2c47d6166b7384db40ae0f352de67acd0a86 Mon Sep 17 00:00:00 2001 From: aavit Date: Fri, 1 Apr 2011 15:14:45 +0200 Subject: 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. --- src/3rdparty/libtiff/libtiff/tif_config.h | 2 ++ 1 file changed, 2 insertions(+) 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 header file. */ +#if !defined(Q_OS_WIN) #define HAVE_UNISTD_H 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ -- cgit v0.12