attributes inheritance fix; apply style to both m_wxwindow and m_widget (patch 984858)

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

diff --git a/src/tiff/tiffcomp.h b/src/tiff/tiffcomp.h
index 2f7d0dd2cb3666bd1b7228df48629e288450e81d..89c2a57c19e8a8d29470520ce1410152c2f7f40a 100644 (file)
--- a/src/tiff/tiffcomp.h
+++ b/src/tiff/tiffcomp.h
@@ -60,9 +60,13 @@
 #endif
 #endif
 
 #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>


@@ -83,9 +87,11 @@
  * 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>
 #include <stdlib.h>

+#ifndef __MACH__

 #define        BSDTYPES
 #define        BSDTYPES

+#endif

 #define        HAVE_UNISTD_H   0
 #elif defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
 #define BSDTYPES
 #define        HAVE_UNISTD_H   0
 #elif defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
 #define BSDTYPES


@@ -137,7 +143,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;