diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 18:25:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 18:25:51 +0000 |
| commit | 777eccbd38143253d25c3f7f06c62d793d6413e9 (patch) | |
| tree | 84c707ee940911141727d284a3eab32bc86bab72 /tools/source/zcodec | |
| parent | 5c6ba31fb936d962b3610619b25d4b77351554c0 (diff) | |
INTEGRATION: CWS geordi2q11 (1.1.1.1.206); FILE MERGED
2003/12/17 11:21:38 hr 1.1.1.1.206.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'tools/source/zcodec')
| -rw-r--r-- | tools/source/zcodec/makefile.mk | 7 | ||||
| -rw-r--r-- | tools/source/zcodec/zcodec.cxx | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/tools/source/zcodec/makefile.mk b/tools/source/zcodec/makefile.mk index f7f3fcdf21e3..5596d3fcd141 100644 --- a/tools/source/zcodec/makefile.mk +++ b/tools/source/zcodec/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 17:03:10 $ +# last change: $Author: vg $ $Date: 2003-12-17 19:25:35 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -73,6 +73,9 @@ TARGET=zcodec # --- Files -------------------------------------------------------- +.IF "$(SYSTEM_ZLIB)" == "YES" +CFLAGS+=-DSYSTEM_ZLIB +.ENDIF SLOFILES= $(SLO)$/zcodec.obj # --- Targets ------------------------------------------------------ diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx index 86230b275004..506ab7c2b938 100644 --- a/tools/source/zcodec/zcodec.cxx +++ b/tools/source/zcodec/zcodec.cxx @@ -2,9 +2,9 @@ * * $RCSfile: zcodec.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:03:10 $ + * last change: $Author: vg $ $Date: 2003-12-17 19:25:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,8 +63,12 @@ #include "stream.hxx" #endif #ifndef _ZLIB_H +#ifdef SYSTEM_ZLIB +#include "zlib.h" +#else #include "zlib/zlib.h" #endif +#endif #ifndef _ZCODEC_HXX #include "zcodec.hxx" #endif |