Added missing licence line

[wxWidgets.git] / src / tiff / tiffcomp.h

diff --git a/src/tiff/tiffcomp.h b/src/tiff/tiffcomp.h
index fc7198019fabfd5770e3c6015e5367339afcbb51..86c0a15e579bb183e89972f1d6c42bf653d1e3c3 100644 (file)
--- a/src/tiff/tiffcomp.h
+++ b/src/tiff/tiffcomp.h
@@ -83,10 +83,8 @@
 #include <stdlib.h>
 #define        BSDTYPES
 #define        HAVE_UNISTD_H   0
 #include <stdlib.h>
 #define        BSDTYPES
 #define        HAVE_UNISTD_H   0

-#elif defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
-#  if !defined(__MINGW32__)     /* GRG */
-#  define BSDTYPES
-#  endif
+#elif (defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) || defined(_WIN32)) && !defined(unix)
+#define        BSDTYPES

 #elif defined(OS2_16) || defined(OS2_32)
 #define        BSDTYPES
 #elif defined(__acornriscos)
 #elif defined(OS2_16) || defined(OS2_32)
 #define        BSDTYPES
 #elif defined(__acornriscos)


@@ -121,11 +119,17 @@
  * then define BSDTYPES in your Makefile.
  */
 #if defined(BSDTYPES)
  * then define BSDTYPES in your Makefile.
  */
 #if defined(BSDTYPES)

+# ifndef _BSDTYPES_DEFINED
+#  ifndef __u_char_defined

 typedef        unsigned char u_char;
 typedef        unsigned short u_short;
 typedef        unsigned int u_int;
 typedef        unsigned long u_long;
 typedef        unsigned char u_char;
 typedef        unsigned short u_short;
 typedef        unsigned int u_int;
 typedef        unsigned long u_long;

-#endif
+#   define __u_char_defined
+#  endif /* __u_char_defined */
+#  define _BSDTYPES_DEFINED
+# endif /* _BSDTYPES_DEFINED */
+#endif /* BSDTYPES */

 
 /*
  * dblparam_t is the type that a double precision
 
 /*
  * dblparam_t is the type that a double precision