From e0ea0b7f1c19d1c38f6907c6927af535d66178dc Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 1 Nov 2004 00:01:40 +0000 Subject: [PATCH] Work around the fact that Metrowerks (CW 8.3) and Apple (10.2.8 sdk) headers try to detect each other and change their behavior but just wind up screwing everything up. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/pnghand.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/mac/carbon/pnghand.cpp b/src/mac/carbon/pnghand.cpp index 9ac29da3c2..3241b88a3a 100644 --- a/src/mac/carbon/pnghand.cpp +++ b/src/mac/carbon/pnghand.cpp @@ -27,6 +27,17 @@ #include #include +#if defined(__DARWIN__) +/* MW's math routines do certain things if __FP__ (the include guard around +CarbonCore's fp.h) is defined. CarbonCore's fp.h does certain things if +__cmath__ is defined so it seems the easy thing to do is to make sure +__cmath__ is effectively not defined which counteracts the MWERKS check +then when the real cmath is included everything will be okay. +*/ +#include +//#include +#endif //defined(__DARWIN__) + #if wxUSE_IOSTREAMH # include #else -- 2.45.2