summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-04-12 16:05:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-04-13 13:15:25 +0100
commit452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch)
tree950d062f9e183873d64b06e212568a3b0968bb58 /sdext
parent99b04ed2be3023bec874fce529d453123f48ac99 (diff)
gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard" so we don't have to patch so much, similiarly rename to libz
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, 0 insertions, 13 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 9c36cf803128..14ff3b992d48 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -36,11 +36,7 @@
#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 ab4e5fcc811b..f77c82ef73e0 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -32,11 +32,7 @@
#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 71b0c8989228..aee3a7081ba8 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
@@ -32,12 +32,7 @@
#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;