summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Eckels <eckels@google.com>2012-10-04 13:01:01 -0700
committerLucas Eckels <eckels@google.com>2012-10-04 13:09:49 -0700
commitb84566a89862677bf62f5e9ee40744cc10fbcb41 (patch)
treec4b6a95492bb6653cdbd7eb36a699f65fcf7cda8
parentc9db81c4ea1afada45f0cd0d47fa83446ff0a077 (diff)
downloadfree-image-jumper-stable.tar.gz
Remove unistd.h define on Windows.jumper-stable-altjumper-stable
This define conflicts with one used by zlib. Change-Id: Ic683192f56a465cf6eb8d05f710dda872a04105c
-rw-r--r--Source/LibTIFF/tif_config.h3
1 files changed, 3 insertions, 0 deletions
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 <unistd.h> 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 <windows.h> header file. */
/* #undef HAVE_WINDOWS_H */