From d66a16439c91e96d583ac0b1f923205685f0cd4a Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Mon, 25 Sep 2000 21:02:44 +0000
Subject: [PATCH] don't do win32 stuff if unix defined

---
 libtiff/tiffcomp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libtiff/tiffcomp.h b/libtiff/tiffcomp.h
index 4fd58ffe..63e6a98e 100644
--- a/libtiff/tiffcomp.h
+++ b/libtiff/tiffcomp.h
@@ -1,4 +1,4 @@
-/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffcomp.h,v 1.1 1999-07-27 21:50:27 mike Exp $ */
+/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Attic/tiffcomp.h,v 1.2 2000-09-25 21:02:44 warmerda Exp $ */
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
@@ -83,7 +83,7 @@
 #include <stdlib.h>
 #define	BSDTYPES
 #define	HAVE_UNISTD_H	0
-#elif defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
+#elif (defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)) && !defined(unix)
 #define	BSDTYPES
 #elif defined(OS2_16) || defined(OS2_32)
 #define	BSDTYPES