diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-08 15:47:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 23:34:26 +0200 |
| commit | 3c38b7727a3deab37c5e9b822cec53c081e2b6e3 (patch) | |
| tree | 61b40e23ba463a235d7bc41028630a068f3c4fe2 /sdext | |
| parent | e567baf92c0fc71e862a2cf07e029576ee36cd77 (diff) | |
zlib: remove ExternalPackage_zlib
Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/pdfparse/pdfentries.cxx | 7 | ||||
| -rw-r--r-- | sdext/source/pdfimport/test/tests.cxx | 6 | ||||
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 7 |
3 files changed, 4 insertions, 16 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index b9120ed4a077..99243b4dc3d5 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -26,11 +26,8 @@ #include <rtl/alloc.h> #include <rtl/digest.h> #include <rtl/cipher.h> -#ifdef SYSTEM_ZLIB -#include "zlib.h" -#else -#include <zlib/zlib.h> -#endif + +#include <zlib.h> #include <math.h> #include <map> diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index a90010fdbaee..5ea11848dc3e 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -17,11 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifdef SYSTEM_ZLIB -#include "zlib.h" -#else -#include <zlib/zlib.h> -#endif +#include <zlib.h> #include "outputwrap.hxx" #include "contentsink.hxx" diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx index 2bb11237bc6f..5fb6967befef 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx @@ -20,12 +20,7 @@ #include "pnghelper.hxx" #include <sal/macros.h> -#ifdef SYSTEM_ZLIB -#include "zlib.h" -#else -#define ZLIB_INTERNAL 1 -#include <zlib/zlib.h> -#endif +#include <zlib.h> using namespace pdfi; |