summaryrefslogtreecommitdiff
path: root/infback.c
diff options
context:
space:
mode:
authorHans Kristian Rosbach <hk-git@circlestorm.org>2015-05-11 15:55:42 +0200
committerHans Kristian Rosbach <hk-git@circlestorm.org>2015-05-12 11:26:30 +0200
commitb3dca09caf3350d711066c85ef0101628ed0947c (patch)
treed58bf27f914cf9b5874942d641a25c7caf107f37 /infback.c
parent7776efc81ba38e4877344ce75174a03b0fdf8057 (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 'infback.c')
-rw-r--r--infback.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/infback.c b/infback.c
index 922eeeb..c8eee5e 100644
--- a/infback.c
+++ b/infback.c
@@ -42,19 +42,11 @@ int stream_size;
return Z_STREAM_ERROR;
strm->msg = Z_NULL; /* in case we return an error */
if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
- return Z_STREAM_ERROR;
-#else
strm->zalloc = zcalloc;
strm->opaque = (void *)0;
-#endif
}
if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
- return Z_STREAM_ERROR;
-#else
strm->zfree = zcfree;
-#endif
state = (struct inflate_state *)ZALLOC(strm, 1,
sizeof(struct inflate_state));
if (state == Z_NULL) return Z_MEM_ERROR;