diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:10 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:10 +0200 |
| commit | 66c4b436fc35d3259a3a2ab335a93c89e1347696 (patch) | |
| tree | 04052fcc1a8484452d6578d21179671b52e98b74 /sdext | |
| parent | fa9174ba091bc8138ccf230ed6e2332c7c5ce3a3 (diff) | |
| parent | d36b7a5f861f5eac28a854a8e75c8299203859ce (diff) | |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
swext/mediawiki/build.xml
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 |