diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-28 15:39:42 +0000 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-28 15:39:42 +0000 |
commit | 33e0a3ab06c55cc2711a9cf1554b787d0bf753b7 (patch) | |
tree | 6209dfaddb9d45b8110993d4e5bf1fe3ee0635f7 /hwpfilter/source/hgzip.h | |
parent | e414b2e4164b16f3a119aab81c7af6eb98059a78 (diff) |
INTEGRATION: CWS ooo19prep (1.1.14); FILE MERGED
2004/06/02 11:32:10 mh 1.1.14.1: patch: use systems zlib if configured, #i26484#
Diffstat (limited to 'hwpfilter/source/hgzip.h')
-rw-r--r-- | hwpfilter/source/hgzip.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/hwpfilter/source/hgzip.h b/hwpfilter/source/hgzip.h index c35835a67c16..e051486d0072 100644 --- a/hwpfilter/source/hgzip.h +++ b/hwpfilter/source/hgzip.h @@ -2,9 +2,9 @@ * * $RCSfile: hgzip.h,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dvo $ $Date: 2003-10-15 14:35:46 $ + * last change: $Author: hjs $ $Date: 2004-06-28 16:39:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,13 +61,17 @@ * ************************************************************************/ -/* $Id: hgzip.h,v 1.1 2003-10-15 14:35:46 dvo Exp $ */ +/* $Id: hgzip.h,v 1.2 2004-06-28 16:39:26 hjs Exp $ */ #ifndef _HWPGZIP_H_ #define _HWPGZIP_H_ // DVO: add zlib/ prefix +#ifdef SYSTEM_ZLIB +#include <zlib.h> +#else #include "zlib/zlib.h" +#endif class HStream; /** |