summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-04-13 14:06:05 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-04-13 14:06:55 +0100
commit3934efe28c70b1c21a60f38fe726a935c15f4e99 (patch)
treec322f38a215b05ff0c457366e08fab9255b64114 /sdext
parent134fe756a1659e352c96d0a6da34dd3c7d23e3a9 (diff)
sigh, need a 64bit zlib too on windows, reverting
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfentries.cxx4
-rw-r--r--sdext/source/pdfimport/test/tests.cxx4
-rw-r--r--sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx5
3 files changed, 13 insertions, 0 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 14ff3b992d48..9c36cf803128 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -36,7 +36,11 @@
#include <rtl/digest.h>
#include <rtl/cipher.h>
#include <rtl/memory.h>
+#ifdef SYSTEM_ZLIB
#include "zlib.h"
+#else
+#include <zlib/zlib.h>
+#endif
#include <math.h>
#include <map>
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index f77c82ef73e0..ab4e5fcc811b 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -32,7 +32,11 @@
#define BASEGFX_STATICLIBRARY
+#ifdef SYSTEM_ZLIB
#include "zlib.h"
+#else
+#include <zlib/zlib.h>
+#endif
#include "outputwrap.hxx"
#include "contentsink.hxx"
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
index aee3a7081ba8..71b0c8989228 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
@@ -32,7 +32,12 @@
#include "pnghelper.hxx"
#include <sal/macros.h>
+#ifdef SYSTEM_ZLIB
#include "zlib.h"
+#else
+#define ZLIB_INTERNAL 1
+#include <zlib/zlib.h>
+#endif
using namespace pdfi;