diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-10-28 20:24:46 +0200 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-16 17:15:37 +0100 |
| commit | 52c869166f68d41750955ed2056dde1b642f0415 (patch) | |
| tree | 0e5be2f9b25e59e12ab2f8db3179ba72d25054ae /lib/gdi | |
| parent | db7f9eb0a8f0d7af9d34d74986b910fe689f711f (diff) | |
| download | enigma2-52c869166f68d41750955ed2056dde1b642f0415.tar.gz enigma2-52c869166f68d41750955ed2056dde1b642f0415.zip | |
define PNG_SKIP_SETJMP_CHECK to fix conflict with Python.h
Diffstat (limited to 'lib/gdi')
| -rw-r--r-- | lib/gdi/epng.cpp | 1 | ||||
| -rw-r--r-- | lib/gdi/picload.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/gdi/epng.cpp b/lib/gdi/epng.cpp index 972a89d3..fd33298f 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 c162f89d..0ce10c09 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> |