summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-12-17 17:01:48 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-12-17 17:01:48 +0000
commit44425aa1b387683310256b5fd9a849a19fad9e55 (patch)
tree5b67aa42251263c52befd816315913e8ddde85ee /package
parent511b00c3e94702c399061487b52b6669068eee03 (diff)
INTEGRATION: CWS geordi2q11 (1.9.82); FILE MERGED
2003/12/16 13:57:11 hr 1.9.82.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'package')
-rw-r--r--package/source/zipapi/CRC32.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/package/source/zipapi/CRC32.cxx b/package/source/zipapi/CRC32.cxx
index b892b8e40811..f9da5d46ae89 100644
--- a/package/source/zipapi/CRC32.cxx
+++ b/package/source/zipapi/CRC32.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: CRC32.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: mtg $ $Date: 2001-12-04 17:48:19 $
+ * last change: $Author: vg $ $Date: 2003-12-17 18:01:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,8 +62,12 @@
#include <CRC32.hxx>
#endif
#ifndef _ZLIB_H
+#ifdef SYSTEM_ZLIB
+#include <zlib.h>
+#else
#include <external/zlib/zlib.h>
#endif
+#endif
#ifndef _PACKAGE_CONSTANTS_HXX_
#include <PackageConstants.hxx>
#endif