including Python.h and png.h: a second try, special case for linux

efiring · efiring · commit 4f6db189afb9 · 2010-09-17T06:41:34.000Z
svn path=/branches/v1_0_maint/; revision=8708
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -4,9 +4,6 @@
 /* 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"
 #include "_backend_agg.h"
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -1,8 +1,26 @@
+
+/* For linux, png.h must be imported before Python.h because
+   png.h needs to be the one to define setjmp.
+   Undefining _POSIX_C_SOURCE and _XOPEN_SOURCE stops a couple
+   of harmless warnings.
+*/
+
+#ifdef __linux__
+#   include <png.h>
+#   ifdef _POSIX_C_SOURCE
+#       undef _POSIX_C_SOURCE
+#   endif
+#   ifdef _XOPEN_SOURCE
+#       undef _XOPEN_SOURCE
+#   endif
+#   include "Python.h"
+#else
+
 /* Python API mandates Python.h is included *first* */
-#include "Python.h"
+#   include "Python.h"
 
-#define PNG_SKIP_SETJMP_CHECK
-#include <png.h>
+#   include <png.h>
+#endif
 
 // TODO: Un CXX-ify this module
 #include "CXX/Extensions.hxx"
