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 | 71a8bc6207269a0079d83d20fddb9038fb1db389 (patch) | |
tree | 9e0122f7dfee9c548c2948c9f1eb085b5e8bdcb3 /sdext | |
parent | 2c5126e34e64b1e184a36f950b58e91efd2de5cb (diff) | |
parent | 14551a384ca5bde96224c98354152014aae1bed7 (diff) |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4integration/dev300_m106
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 890664b..6029e33 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 |