git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3694531
)
include png.h before any other headers, because it complains if setjmp.h was included...
author
Andreas Oberritter
<obi@opendreambox.org>
Tue, 25 Mar 2008 16:01:47 +0000
(16:01 +0000)
committer
Andreas Oberritter
<obi@opendreambox.org>
Tue, 25 Mar 2008 16:01:47 +0000
(16:01 +0000)
lib/gdi/picload.cpp
patch
|
blob
|
history
diff --git
a/lib/gdi/picload.cpp
b/lib/gdi/picload.cpp
index f8949cff448ad3abf0c68bc13671a31267929058..e8a0e8c0bcd6f91ba860cf32cedfa2efdaf0cf7b 100644
(file)
--- 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 <lib/gdi/picload.h>
#include "picexif.h"
#include <lib/python/python.h>
-#include <png.h>
-
#include <fcntl.h>
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdio.h>
@@
-14,7
+13,6
@@
extern "C" {
#include <gif_lib.h>
//#include "transupp.h"
}
#include <gif_lib.h>
//#include "transupp.h"
}
-#include <setjmp.h>
unsigned char *pic_buffer=NULL;
unsigned char *pic_buffer=NULL;