From b84566a89862677bf62f5e9ee40744cc10fbcb41 Mon Sep 17 00:00:00 2001 From: Lucas Eckels Date: Thu, 4 Oct 2012 13:01:01 -0700 Subject: Remove unistd.h define on Windows. This define conflicts with one used by zlib. Change-Id: Ic683192f56a465cf6eb8d05f710dda872a04105c --- Source/LibTIFF/tif_config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/LibTIFF/tif_config.h b/Source/LibTIFF/tif_config.h index c227a9d..08fa344 100644 --- a/Source/LibTIFF/tif_config.h +++ b/Source/LibTIFF/tif_config.h @@ -189,7 +189,10 @@ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the header file. */ +#ifndef WIN32 +// On Windows, this conflicts with zlib's configuration. #define HAVE_UNISTD_H 1 +#endif /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ -- cgit v1.2.3