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

diff --git a/src/mac/carbon/pnghand.cpp b/src/mac/carbon/pnghand.cpp
index 9ac29da3c2d9eb46eaa1635de5142689401177ca..3241b88a3ace29ce82c01051759bb488db958f2a 100644 (file)
--- a/src/mac/carbon/pnghand.cpp
+++ b/src/mac/carbon/pnghand.cpp
@@ -27,6 +27,17 @@
 #include <stdio.h>
 #include <string.h>
 
+#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 <CoreServices/CoreServices.h>
+//#include <cmath>
+#endif //defined(__DARWIN__)
+
 #if wxUSE_IOSTREAMH
 #   include <fstream.h>
 #else