TransferFrom/ToWindow() were reverted, fixed

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

diff --git a/src/tiff/tiffcomp.h b/src/tiff/tiffcomp.h
index fc7198019fabfd5770e3c6015e5367339afcbb51..dde87646578800f1c4e9ea775e0c1bdf8aa36bcc 100644 (file)
--- a/src/tiff/tiffcomp.h
+++ b/src/tiff/tiffcomp.h
@@ -52,13 +52,21 @@
 #endif
 
 #if defined(__MWERKS__) || defined(THINK_C)
 #endif
 
 #if defined(__MWERKS__) || defined(THINK_C)

+#ifdef __MACH__
+#include <sys/types.h>
+#else

 #include <unix.h>
 #include <math.h>
 #endif
 #include <unix.h>
 #include <math.h>
 #endif

+#endif
+
+#if defined (__SC__) && !defined (__DMC__)
+    #define __SYMANTEC__
+#endif

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

-#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#if defined(__PPCC__) || defined(__SYMANTEC__) || defined(__MRC__)

 #include <types.h>
 #elif !defined(__MWERKS__) && !defined(THINK_C) && !defined(__acornriscos) && !defined(applec)
 #include <sys/types.h>
 #include <types.h>
 #elif !defined(__MWERKS__) && !defined(THINK_C) && !defined(__acornriscos) && !defined(applec)
 #include <sys/types.h>


@@ -79,14 +87,14 @@
  * additional includes are also done to pull in the
  * appropriate definitions we're looking for.
  */
  * additional includes are also done to pull in the
  * appropriate definitions we're looking for.
  */

-#if defined(__MWERKS__) || defined(THINK_C) || defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#if defined(__MWERKS__) || defined(THINK_C) || defined(__PPCC__) || defined(__SYMANTEC__) || defined(__MRC__)

 #include <stdlib.h>
 #define        BSDTYPES
 #define        HAVE_UNISTD_H   0
 #elif defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
 #include <stdlib.h>
 #define        BSDTYPES
 #define        HAVE_UNISTD_H   0
 #elif defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)

-#  if !defined(__MINGW32__)     /* GRG */
-#  define BSDTYPES
-#  endif
+#define BSDTYPES
+#elif defined(__DJGPP__)
+#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)


@@ -133,7 +141,7 @@ typedef     unsigned long u_long;
  * stack (when coerced by the compiler).
  */
 /* Note: on MacPowerPC "extended" is undefined. So only use it for 68K-Macs */
  * stack (when coerced by the compiler).
  */
 /* Note: on MacPowerPC "extended" is undefined. So only use it for 68K-Macs */

-#if defined(__SC__) || defined(THINK_C)
+#if defined(__SYMANTEC__) || defined(THINK_C)

 typedef extended dblparam_t;
 #else
 typedef double dblparam_t;
 typedef extended dblparam_t;
 #else
 typedef double dblparam_t;