Merged revisions 8706 via svnmerge from

efiring · efiring · commit fc0c773aff0a · 2010-09-17T02:52:46.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8706 | efiring | 2010-09-16 16:46:04 -1000 (Thu, 16 Sep 2010) | 5 lines include Python.h first in extension code; patch by Jason Grout. This cleans up the preprocessor directives and allows compilation on Solaris. A preprocessor directive is added to keep png.h from failing on Linux because Python.h has caused setjmp.h to be included. ........ svn path=/trunk/matplotlib/; revision=8707
diff --git a/CXX/WrapPython.h b/CXX/WrapPython.h
@@ -38,26 +38,12 @@
 #ifndef __PyCXX_wrap_python_hxx__
 #define __PyCXX_wrap_python_hxx__
 
+/* Python API mandates Python.h is included *first* */
+#include "Python.h"
+
 // On some platforms we have to include time.h to get select defined
 #if !defined(__WIN32__) && !defined(WIN32) && !defined(_WIN32) && !defined(_WIN64)
 #include <sys/time.h>
 #endif
 
-// Prevent multiple conflicting definitions of swab from stdlib.h and unistd.h
-#if defined(__sun) || defined(sun)
-#if defined(_XPG4)
-#undef _XPG4
-#endif
-#if defined(_XPG3)
-#undef _XPG3
-#endif
-#endif
-
-// Python.h will redefine these and generate warning in the process
-#undef _XOPEN_SOURCE
-#undef _POSIX_C_SOURCE
-
-// pull in python definitions
-#include <Python.h>
-
 #endif
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -1,11 +1,11 @@
 /* A rewrite of _backend_agg using PyCXX to handle ref counting, etc..
  */
-#include <png.h>
 
-// To remove a gcc warning
-#ifdef _POSIX_C_SOURCE
-#undef _POSIX_C_SOURCE
-#endif
+/* Python API mandates Python.h is included *first* */
+#include "Python.h"
+
+#define PNG_SKIP_SETJMP_CHECK
+#include <png.h>
 
 #include "ft2font.h"
 #include "_image.h"
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -1,8 +1,4 @@
-// To remove a gcc warning
-#ifdef _POSIX_C_SOURCE
-#undef _POSIX_C_SOURCE
-#endif
-
+/* Python API mandates Python.h is included *first* */
 #include "Python.h"
 #include <string>
 
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -1,9 +1,8 @@
-#include <png.h>
+/* Python API mandates Python.h is included *first* */
+#include "Python.h"
 
-// To remove a gcc warning
-#ifdef _POSIX_C_SOURCE
-#undef _POSIX_C_SOURCE
-#endif
+#define PNG_SKIP_SETJMP_CHECK
+#include <png.h>
 
 // TODO: Un CXX-ify this module
 #include "CXX/Extensions.hxx"
