From 4d4e1be2ef7a40eecf85555a8eb3cef45202b422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 25 Nov 2004 16:53:41 +0000 Subject: [PATCH] DMC conflicts with old SC. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/tiff/tiffcomp.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tiff/tiffcomp.h b/src/tiff/tiffcomp.h index 86c0a15e57..cb4a659191 100644 --- a/src/tiff/tiffcomp.h +++ b/src/tiff/tiffcomp.h @@ -58,7 +58,7 @@ #include -#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__) +#if defined(__PPCC__) || ( defined(__SC__) && !defined(__DMC__) ) || defined(__MRC__) #include #elif !defined(__MWERKS__) && !defined(THINK_C) && !defined(__acornriscos) && !defined(applec) #include @@ -79,7 +79,7 @@ * 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 #define BSDTYPES #define HAVE_UNISTD_H 0 @@ -137,7 +137,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 */ -#if defined(__SC__) || defined(THINK_C) +#if ( defined(__SC__) && !defined(__DMC__) ) || defined(THINK_C) typedef extended dblparam_t; #else typedef double dblparam_t;