From 52c869166f68d41750955ed2056dde1b642f0415 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Thu, 28 Oct 2010 20:24:46 +0200
Subject: [PATCH] define PNG_SKIP_SETJMP_CHECK to fix conflict with Python.h

---
 lib/gdi/epng.cpp    | 1 +
 lib/gdi/picload.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/gdi/epng.cpp b/lib/gdi/epng.cpp
index 972a89d..fd33298 100644
--- 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
--- 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>
-- 
2.7.4