summaryrefslogtreecommitdiff
path: root/hwpfilter
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 /hwpfilter
parent134fe756a1659e352c96d0a6da34dd3c7d23e3a9 (diff)
sigh, need a 64bit zlib too on windows, reverting
Diffstat (limited to 'hwpfilter')
-rw-r--r--hwpfilter/source/hgzip.h5
-rw-r--r--hwpfilter/source/hiodev.cxx5
2 files changed, 10 insertions, 0 deletions
diff --git a/hwpfilter/source/hgzip.h b/hwpfilter/source/hgzip.h
index 600d8f1ebe8c..c8b2cbe19251 100644
--- a/hwpfilter/source/hgzip.h
+++ b/hwpfilter/source/hgzip.h
@@ -29,7 +29,12 @@
#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 e8b45d65fa38..20b368a770cb 100644
--- a/hwpfilter/source/hiodev.cxx
+++ b/hwpfilter/source/hiodev.cxx
@@ -28,7 +28,12 @@
#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