diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-12 16:05:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 13:15:25 +0100 |
| commit | 452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch) | |
| tree | 950d062f9e183873d64b06e212568a3b0968bb58 /package | |
| parent | 99b04ed2be3023bec874fce529d453123f48ac99 (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 'package')
| -rw-r--r-- | package/Library_package2.mk | 6 | ||||
| -rw-r--r-- | package/source/zipapi/Deflater.cxx | 4 | ||||
| -rw-r--r-- | package/source/zipapi/Inflater.cxx | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/package/Library_package2.mk b/package/Library_package2.mk index 223e280d2830..fcb7b6225932 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -88,10 +88,4 @@ $(eval $(call gb_Library_add_exception_objects,package2,\ package/source/zippackage/ZipPackageStream \ )) -ifeq ($(SYSTEM_ZLIB),YES) -$(eval $(call gb_Library_add_defs,package2,\ - -DSYSTEM_ZLIB \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 75d9d39e0436..3333c0d8794b 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -27,11 +27,7 @@ ************************************************************************/ #include <package/Deflater.hxx> -#ifdef SYSTEM_ZLIB #include <zlib.h> -#else -#include <external/zlib/zlib.h> -#endif #include <com/sun/star/packages/zip/ZipConstants.hpp> #include <string.h> // for memset diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index 2149e59e5ddf..b83eea021e63 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -27,11 +27,7 @@ ************************************************************************/ #include <package/Inflater.hxx> -#ifdef SYSTEM_ZLIB #include <zlib.h> -#else -#include <external/zlib/zlib.h> -#endif #include <string.h> // for memset using namespace com::sun::star::uno; |