Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / tiff / libtiff / tif_config.h

diff --git a/src/tiff/libtiff/tif_config.h b/src/tiff/libtiff/tif_config.h
index ea109c769d437e22efd86e89b4c96be8e81a272b..b0840c777f349d196bee8b9ca204edee358327d9 100644 (file)
--- a/src/tiff/libtiff/tif_config.h
+++ b/src/tiff/libtiff/tif_config.h
@@ -32,7 +32,7 @@
 #define SIZEOF_LONG 4
 #endif
 
 #define SIZEOF_LONG 4
 #endif
 

-#if __BIG_ENDIAN__
+#ifdef __BIG_ENDIAN__

     /* Set the native cpu bit order */
     #define HOST_FILLORDER FILLORDER_MSB2LSB
     
     /* Set the native cpu bit order */
     #define HOST_FILLORDER FILLORDER_MSB2LSB
     


@@ -101,8 +101,30 @@
 # endif
 #endif
 
 # endif
 #endif
 

-#ifndef __BORLANDC__ 
+#if !defined (__BORLANDC__) && !defined (__WATCOMC__)

    #define lfind _lfind
 #endif
 
    #define lfind _lfind
 #endif
 

-#endif
\ No newline at end of file
+#ifdef __DMC__
+#define HAVE_INT32
+typedef        long int32;
+#endif
+
+#ifdef _WIN32_WCE
+#   undef HAVE_FCNTL_H
+#   undef HAVE_SYS_TYPES_H
+
+    /*
+       CE headers don't define these standard constants (not even underscored
+       versions), provide our own replacements as they seem to be only used in
+       libtiff own code anyhow.
+     */
+#   define   O_RDONLY    0x0000
+#   define   O_WRONLY    0x0001
+#   define   O_RDWR      0x0002
+#   define   O_CREAT     0x0100
+#   define   O_TRUNC     0x0200
+#   define   O_EXCL      0x0400
+#endif /* _WIN32_WCE */
+
+#endif /* __APPLE__/!__APPLE__ */