diff options
| author | Hans Kristian Rosbach <hk-git@circlestorm.org> | 2015-05-11 15:55:42 +0200 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-git@circlestorm.org> | 2015-05-12 11:26:30 +0200 |
| commit | b3dca09caf3350d711066c85ef0101628ed0947c (patch) | |
| tree | d58bf27f914cf9b5874942d641a25c7caf107f37 /zutil.c | |
| parent | 7776efc81ba38e4877344ce75174a03b0fdf8057 (diff) | |
Remove support for compiling with Z_SOLO.
Make compiling without gzip file operation support the default
(define WITH_GZFILEOP or use --zlib-compat to enable them).
Add initial support for compiling in a zlib-compatible mode, this currently only
enables gzip file operations and sets the ZLIB_COMPAT flag.
Conflicts:
test/minigzip.c
Diffstat (limited to 'zutil.c')
| -rw-r--r-- | zutil.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -6,7 +6,7 @@ /* @(#) $Id$ */ #include "zutil.h" -#ifndef Z_SOLO +#ifdef WITH_GZFILEOP # include "gzguts.h" #endif @@ -107,8 +107,6 @@ const char * ZEXPORT zError(err) return ERR_MSG(err); } -#ifndef Z_SOLO - #ifndef MY_ZCALLOC /* Any system without a special alloc function */ void ZLIB_INTERNAL *zcalloc (void *opaque, unsigned items, unsigned size) @@ -125,5 +123,3 @@ void ZLIB_INTERNAL zcfree (void *opaque, void *ptr) } #endif /* MY_ZCALLOC */ - -#endif /* !Z_SOLO */ |