define PNG_SKIP_SETJMP_CHECK to fix conflict with Python.h

diff --git a/lib/gdi/epng.cpp b/lib/gdi/epng.cpp
index 972a89d..fd33298 100644 (file)
--- a/lib/gdi/epng.cpp
+++ b/lib/gdi/epng.cpp
@@ -1,3 +1,4 @@
+#define PNG_SKIP_SETJMP_CHECK
 #include <png.h>
 #include <stdio.h>
 #include <lib/gdi/epng.h>

diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp
index c162f89..0ce10c0 100644 (file)
--- a/lib/gdi/picload.cpp
+++ b/lib/gdi/picload.cpp
@@ -1,4 +1,5 @@
-#include <png.h>       // must be included before Python.h because of setjmp
+#define PNG_SKIP_SETJMP_CHECK
+#include <png.h>
 #include <fcntl.h>
 
 #include <lib/gdi/picload.h>