can't pass objects through ... (please don't ever ignore this gcc warning)

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

diff --git a/src/tiff/tiffcomp.h b/src/tiff/tiffcomp.h
index 86c0a15e579bb183e89972f1d6c42bf653d1e3c3..0b1aa4c6c5c3e9b693fe1ebd4a2550a605d55273 100644 (file)
--- a/src/tiff/tiffcomp.h
+++ b/src/tiff/tiffcomp.h
@@ -4,28 +4,28 @@
  * Copyright (c) 1990-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
  *
  * Copyright (c) 1990-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
  *

- * Permission to use, copy, modify, distribute, and sell this software and 
+ * Permission to use, copy, modify, distribute, and sell this software and

  * its documentation for any purpose is hereby granted without fee, provided
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
  * publicity relating to the software without the specific, prior written
  * permission of Sam Leffler and Silicon Graphics.
  * its documentation for any purpose is hereby granted without fee, provided
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
  * publicity relating to the software without the specific, prior written
  * permission of Sam Leffler and Silicon Graphics.

- * 
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
- * 
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *

  * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
  * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
  * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
  * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
  * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
  * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

  * OF THIS SOFTWARE.
  */
 
 #ifndef _COMPAT_
  * OF THIS SOFTWARE.
  */
 
 #ifndef _COMPAT_

-#define        _COMPAT_
+#define _COMPAT_

 /*
  * This file contains a hodgepodge of definitions and
  * declarations that are needed to provide compatibility
 /*
  * This file contains a hodgepodge of definitions and
  * declarations that are needed to provide compatibility


@@ -51,14 +51,14 @@
 #define __acornriscos
 #endif
 
 #define __acornriscos
 #endif
 

-#if defined(__MWERKS__) || defined(THINK_C)
+#if (defined(__MWERKS__) && !defined(__MACH__)) || defined(THINK_C)

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

-#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#if defined(__PPCC__) || ( defined(__SC__) && !defined(__DMC__) ) || 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,7 +79,7 @@
  * 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(__SC__) && !defined(__DMC__) ) || defined(__MRC__)

 #include <stdlib.h>
 #define        BSDTYPES
 #define        HAVE_UNISTD_H   0
 #include <stdlib.h>
 #define        BSDTYPES
 #define        HAVE_UNISTD_H   0


@@ -87,6 +87,8 @@
 #define        BSDTYPES
 #elif defined(OS2_16) || defined(OS2_32)
 #define        BSDTYPES
 #define        BSDTYPES
 #elif defined(OS2_16) || defined(OS2_32)
 #define        BSDTYPES

+#elif defined(__MSDOS__)
+#define        BSDTYPES

 #elif defined(__acornriscos)
 #include <stdlib.h>
 #define        BSDTYPES
 #elif defined(__acornriscos)
 #include <stdlib.h>
 #define        BSDTYPES


@@ -137,7 +139,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(__SC__) && !defined(__DMC__) ) || defined(THINK_C)

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


@@ -216,5 +218,8 @@ extern int creat(const char *path, int mode);
 #define HOST_BIGENDIAN 0
 #endif
 
 #define HOST_BIGENDIAN 0
 #endif
 

+#ifndef LINKAGEMODE
+    #define LINKAGEMODE
+#endif

 
 #endif /* _COMPAT_ */
 
 #endif /* _COMPAT_ */