diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-24 15:03:17 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-24 15:03:17 +0200 |
| commit | 33f2f512191c4c730345ae7e113fa5e0334b28b0 (patch) | |
| tree | aa0542f4d56f9fffd03d67cfb46fc1d459a02648 /sdext | |
| parent | cd9c9307ddb284531f46b32f788982a1ff2465f0 (diff) | |
| parent | 66c4b436fc35d3259a3a2ab335a93c89e1347696 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx index fd44fba4b016..71b0c8989228 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx @@ -35,6 +35,7 @@ #ifdef SYSTEM_ZLIB #include "zlib.h" #else +#define ZLIB_INTERNAL 1 #include <zlib/zlib.h> #endif |