From: Andreas Oberritter <obi@opendreambox.org>
Date: Tue, 25 Mar 2008 16:01:47 +0000 (+0000)
Subject: include png.h before any other headers, because it complains if setjmp.h was included... 
X-Git-Tag: 2.6.0~1448
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/055a01deb76a681dda718ec58f972dd20b82a8c3

include png.h before any other headers, because it complains if setjmp.h was included by another header (i.e. Python.h)
---

diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp
index f8949cff..e8a0e8c0 100644
--- a/lib/gdi/picload.cpp
+++ b/lib/gdi/picload.cpp
@@ -1,9 +1,8 @@
+#include <png.h>	// must be included before Python.h because of setjmp
 #include <lib/gdi/picload.h>
 #include "picexif.h"
 #include <lib/python/python.h>
 
-#include <png.h>
-
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -14,7 +13,6 @@ extern "C" {
 #include <gif_lib.h>
 //#include "transupp.h"
 }
-#include <setjmp.h>
 
 unsigned char *pic_buffer=NULL;