Replaced SOCKLEN_T by WX_SOCKLEN_T to resolve conflict with AIX system headers.

[wxWidgets.git] / src / mac / carbon / pnghand.cpp

diff --git a/src/mac/carbon/pnghand.cpp b/src/mac/carbon/pnghand.cpp
index b030b8d80b4c1e31010fa4b35434501b998742b6..bbcfcbec4554de73c6331da300cc9d59f3b7f995 100644 (file)
--- a/src/mac/carbon/pnghand.cpp
+++ b/src/mac/carbon/pnghand.cpp
@@ -6,10 +6,10 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #  pragma implementation "pngread.h"
 #  pragma implementation "pnghand.h"
 #endif
 #  pragma implementation "pngread.h"
 #  pragma implementation "pnghand.h"
 #endif


@@ -21,10 +21,23 @@
 #  pragma hdrstop
 #endif
 
 #  pragma hdrstop
 #endif
 

+#if 0 // wxUSE_LIBPNG
+

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <stdlib.h>
 #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
 #if wxUSE_IOSTREAMH
 #   include <fstream.h>
 #else


@@ -902,3 +915,4 @@ bool wxPNGFileHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, in
     return FALSE;
 }
 
     return FALSE;
 }
 

+#endif //wxUSE_LIBPNG