define PNG_SKIP_SETJMP_CHECK to fix conflict with Python.h

diff --git a/lib/gdi/epng.cpp b/lib/gdi/epng.cpp
index 972a89d374cf647f6eb667db5e90da730b6c85ea..fd33298f9ac4027cfd05678dd819cdf06a598a4f 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>
 #include <png.h>
 #include <stdio.h>
 #include <lib/gdi/epng.h>

diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp
index c162f89d9c81370649355c6423e4ce8402f75535..0ce10c09806e70099b27b98f2a1ea35a26e92577 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>
 #include <fcntl.h>
 
 #include <lib/gdi/picload.h>