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 /hwpfilter/source | |
parent | WaE: declaration of 'rand' shadows a global declaration (diff) | |
download | core-452af5f4522e750627d0c0ac9fbc794aeb1f1f8f.tar.gz core-452af5f4522e750627d0c0ac9fbc794aeb1f1f8f.zip |
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 'hwpfilter/source')
-rw-r--r-- | hwpfilter/source/hgzip.h | 5 | ||||
-rw-r--r-- | hwpfilter/source/hiodev.cxx | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/hwpfilter/source/hgzip.h b/hwpfilter/source/hgzip.h index c8b2cbe19251..600d8f1ebe8c 100644 --- a/hwpfilter/source/hgzip.h +++ b/hwpfilter/source/hgzip.h @@ -29,12 +29,7 @@ #ifndef _HWPGZIP_H_ #define _HWPGZIP_H_ -// DVO: add zlib/ prefix -#ifdef SYSTEM_ZLIB #include <zlib.h> -#else -#include "zlib/zlib.h" -#endif class HStream; /** diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx index 20b368a770cb..e8b45d65fa38 100644 --- a/hwpfilter/source/hiodev.cxx +++ b/hwpfilter/source/hiodev.cxx @@ -28,12 +28,7 @@ #include <stdio.h> #include <errno.h> -// DVO: add zlib/ prefix -#ifdef SYSTEM_ZLIB #include <zlib.h> -#else -#include <zlib/zlib.h> -#endif #ifdef WIN32 # include <io.h> #else |