diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-10-07 01:57:07 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-10-07 02:11:56 -0700 |
commit | f442c1e89e99ae5a0068a2d32e7284c2623f09fd (patch) | |
tree | 1bc659f486af707673c36916c4d75ef7f517dece /zconf.h | |
parent | 518ad0177ae2f1aaefc49285b3536a6bd8d9973c (diff) | |
download | zlib-f442c1e89e99ae5a0068a2d32e7284c2623f09fd.tar.gz zlib-f442c1e89e99ae5a0068a2d32e7284c2623f09fd.tar.bz2 zlib-f442c1e89e99ae5a0068a2d32e7284c2623f09fd.zip |
Add a ./config --solo option to make zlib subset with no libary use
A common request has been the ability to compile zlib to require no
other libraries. This --solo option provides that ability. The price
is that the gz*, compress*, and uncompress functions are eliminated,
and that the user must provide memory allocation and free routines to
deflate and inflate when initializing.
Diffstat (limited to '')
-rw-r--r-- | zconf.h | 106 | ||||
-rw-r--r-- | zconf.h.cmakein | 106 | ||||
-rw-r--r-- | zconf.h.in | 106 |
3 files changed, 180 insertions, 138 deletions
@@ -28,9 +28,11 @@ | |||
28 | # define adler32 z_adler32 | 28 | # define adler32 z_adler32 |
29 | # define adler32_combine z_adler32_combine | 29 | # define adler32_combine z_adler32_combine |
30 | # define adler32_combine64 z_adler32_combine64 | 30 | # define adler32_combine64 z_adler32_combine64 |
31 | # define compress z_compress | 31 | # ifndef Z_SOLO |
32 | # define compress2 z_compress2 | 32 | # define compress z_compress |
33 | # define compressBound z_compressBound | 33 | # define compress2 z_compress2 |
34 | # define compressBound z_compressBound | ||
35 | # endif | ||
34 | # define crc32 z_crc32 | 36 | # define crc32 z_crc32 |
35 | # define crc32_combine z_crc32_combine | 37 | # define crc32_combine z_crc32_combine |
36 | # define crc32_combine64 z_crc32_combine64 | 38 | # define crc32_combine64 z_crc32_combine64 |
@@ -49,39 +51,41 @@ | |||
49 | # define deflateTune z_deflateTune | 51 | # define deflateTune z_deflateTune |
50 | # define deflate_copyright z_deflate_copyright | 52 | # define deflate_copyright z_deflate_copyright |
51 | # define get_crc_table z_get_crc_table | 53 | # define get_crc_table z_get_crc_table |
52 | # define gz_error z_gz_error | 54 | # ifndef Z_SOLO |
53 | # define gz_intmax z_gz_intmax | 55 | # define gz_error z_gz_error |
54 | # define gz_strwinerror z_gz_strwinerror | 56 | # define gz_intmax z_gz_intmax |
55 | # define gzbuffer z_gzbuffer | 57 | # define gz_strwinerror z_gz_strwinerror |
56 | # define gzclearerr z_gzclearerr | 58 | # define gzbuffer z_gzbuffer |
57 | # define gzclose z_gzclose | 59 | # define gzclearerr z_gzclearerr |
58 | # define gzclose_r z_gzclose_r | 60 | # define gzclose z_gzclose |
59 | # define gzclose_w z_gzclose_w | 61 | # define gzclose_r z_gzclose_r |
60 | # define gzdirect z_gzdirect | 62 | # define gzclose_w z_gzclose_w |
61 | # define gzdopen z_gzdopen | 63 | # define gzdirect z_gzdirect |
62 | # define gzeof z_gzeof | 64 | # define gzdopen z_gzdopen |
63 | # define gzerror z_gzerror | 65 | # define gzeof z_gzeof |
64 | # define gzflags z_gzflags | 66 | # define gzerror z_gzerror |
65 | # define gzflush z_gzflush | 67 | # define gzflags z_gzflags |
66 | # define gzgetc z_gzgetc | 68 | # define gzflush z_gzflush |
67 | # define gzgetc_ z_gzgetc_ | 69 | # define gzgetc z_gzgetc |
68 | # define gzgets z_gzgets | 70 | # define gzgetc_ z_gzgetc_ |
69 | # define gzoffset z_gzoffset | 71 | # define gzgets z_gzgets |
70 | # define gzoffset64 z_gzoffset64 | 72 | # define gzoffset z_gzoffset |
71 | # define gzopen z_gzopen | 73 | # define gzoffset64 z_gzoffset64 |
72 | # define gzopen64 z_gzopen64 | 74 | # define gzopen z_gzopen |
73 | # define gzprintf z_gzprintf | 75 | # define gzopen64 z_gzopen64 |
74 | # define gzputc z_gzputc | 76 | # define gzprintf z_gzprintf |
75 | # define gzputs z_gzputs | 77 | # define gzputc z_gzputc |
76 | # define gzread z_gzread | 78 | # define gzputs z_gzputs |
77 | # define gzrewind z_gzrewind | 79 | # define gzread z_gzread |
78 | # define gzseek z_gzseek | 80 | # define gzrewind z_gzrewind |
79 | # define gzseek64 z_gzseek64 | 81 | # define gzseek z_gzseek |
80 | # define gzsetparams z_gzsetparams | 82 | # define gzseek64 z_gzseek64 |
81 | # define gztell z_gztell | 83 | # define gzsetparams z_gzsetparams |
82 | # define gztell64 z_gztell64 | 84 | # define gztell z_gztell |
83 | # define gzungetc z_gzungetc | 85 | # define gztell64 z_gztell64 |
84 | # define gzwrite z_gzwrite | 86 | # define gzungetc z_gzungetc |
87 | # define gzwrite z_gzwrite | ||
88 | # endif | ||
85 | # define inflate z_inflate | 89 | # define inflate z_inflate |
86 | # define inflateBack z_inflateBack | 90 | # define inflateBack z_inflateBack |
87 | # define inflateBackEnd z_inflateBackEnd | 91 | # define inflateBackEnd z_inflateBackEnd |
@@ -102,10 +106,14 @@ | |||
102 | # define inflate_copyright z_inflate_copyright | 106 | # define inflate_copyright z_inflate_copyright |
103 | # define inflate_fast z_inflate_fast | 107 | # define inflate_fast z_inflate_fast |
104 | # define inflate_table z_inflate_table | 108 | # define inflate_table z_inflate_table |
105 | # define uncompress z_uncompress | 109 | # ifndef Z_SOLO |
110 | # define uncompress z_uncompress | ||
111 | # endif | ||
106 | # define zError z_zError | 112 | # define zError z_zError |
107 | # define zcalloc z_zcalloc | 113 | # ifndef Z_SOLO |
108 | # define zcfree z_zcfree | 114 | # define zcalloc z_zcalloc |
115 | # define zcfree z_zcfree | ||
116 | # endif | ||
109 | # define zlibCompileFlags z_zlibCompileFlags | 117 | # define zlibCompileFlags z_zlibCompileFlags |
110 | # define zlibVersion z_zlibVersion | 118 | # define zlibVersion z_zlibVersion |
111 | 119 | ||
@@ -115,9 +123,11 @@ | |||
115 | # define alloc_func z_alloc_func | 123 | # define alloc_func z_alloc_func |
116 | # define charf z_charf | 124 | # define charf z_charf |
117 | # define free_func z_free_func | 125 | # define free_func z_free_func |
118 | # define gzFile z_gzFile | 126 | # ifndef Z_SOLO |
119 | # define gz_header z_gz_header | 127 | # define gzFile z_gzFile |
120 | # define gz_headerp z_gz_headerp | 128 | # define gz_header z_gz_header |
129 | # define gz_headerp z_gz_headerp | ||
130 | # endif | ||
121 | # define in_func z_in_func | 131 | # define in_func z_in_func |
122 | # define intf z_intf | 132 | # define intf z_intf |
123 | # define out_func z_out_func | 133 | # define out_func z_out_func |
@@ -130,7 +140,9 @@ | |||
130 | # define voidpf z_voidpf | 140 | # define voidpf z_voidpf |
131 | 141 | ||
132 | /* all zlib structs in zlib.h and zconf.h */ | 142 | /* all zlib structs in zlib.h and zconf.h */ |
133 | # define gz_header_s z_gz_header_s | 143 | # ifndef Z_SOLO |
144 | # define gz_header_s z_gz_header_s | ||
145 | # endif | ||
134 | # define internal_state z_internal_state | 146 | # define internal_state z_internal_state |
135 | 147 | ||
136 | #endif | 148 | #endif |
@@ -377,7 +389,9 @@ typedef uLong FAR uLongf; | |||
377 | #endif | 389 | #endif |
378 | 390 | ||
379 | #ifdef STDC | 391 | #ifdef STDC |
380 | # include <sys/types.h> /* for off_t */ | 392 | # ifndef Z_SOLO |
393 | # include <sys/types.h> /* for off_t */ | ||
394 | # endif | ||
381 | #endif | 395 | #endif |
382 | 396 | ||
383 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and | 397 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and |
@@ -394,7 +408,7 @@ typedef uLong FAR uLongf; | |||
394 | # define Z_LARGE | 408 | # define Z_LARGE |
395 | #endif | 409 | #endif |
396 | 410 | ||
397 | #if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE) | 411 | #if (defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)) && !defined(Z_SOLO) |
398 | # include <unistd.h> /* for SEEK_* and off_t */ | 412 | # include <unistd.h> /* for SEEK_* and off_t */ |
399 | # ifdef VMS | 413 | # ifdef VMS |
400 | # include <unixio.h> /* for off_t */ | 414 | # include <unixio.h> /* for off_t */ |
@@ -404,7 +418,7 @@ typedef uLong FAR uLongf; | |||
404 | # endif | 418 | # endif |
405 | #endif | 419 | #endif |
406 | 420 | ||
407 | #ifndef SEEK_SET | 421 | #if !defined(SEEK_SET) && !defined(Z_SOLO) |
408 | # define SEEK_SET 0 /* Seek from beginning of file. */ | 422 | # define SEEK_SET 0 /* Seek from beginning of file. */ |
409 | # define SEEK_CUR 1 /* Seek from current position. */ | 423 | # define SEEK_CUR 1 /* Seek from current position. */ |
410 | # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ | 424 | # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ |
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index 29680aa..84e4680 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein | |||
@@ -30,9 +30,11 @@ | |||
30 | # define adler32 z_adler32 | 30 | # define adler32 z_adler32 |
31 | # define adler32_combine z_adler32_combine | 31 | # define adler32_combine z_adler32_combine |
32 | # define adler32_combine64 z_adler32_combine64 | 32 | # define adler32_combine64 z_adler32_combine64 |
33 | # define compress z_compress | 33 | # ifndef Z_SOLO |
34 | # define compress2 z_compress2 | 34 | # define compress z_compress |
35 | # define compressBound z_compressBound | 35 | # define compress2 z_compress2 |
36 | # define compressBound z_compressBound | ||
37 | # endif | ||
36 | # define crc32 z_crc32 | 38 | # define crc32 z_crc32 |
37 | # define crc32_combine z_crc32_combine | 39 | # define crc32_combine z_crc32_combine |
38 | # define crc32_combine64 z_crc32_combine64 | 40 | # define crc32_combine64 z_crc32_combine64 |
@@ -51,39 +53,41 @@ | |||
51 | # define deflateTune z_deflateTune | 53 | # define deflateTune z_deflateTune |
52 | # define deflate_copyright z_deflate_copyright | 54 | # define deflate_copyright z_deflate_copyright |
53 | # define get_crc_table z_get_crc_table | 55 | # define get_crc_table z_get_crc_table |
54 | # define gz_error z_gz_error | 56 | # ifndef Z_SOLO |
55 | # define gz_intmax z_gz_intmax | 57 | # define gz_error z_gz_error |
56 | # define gz_strwinerror z_gz_strwinerror | 58 | # define gz_intmax z_gz_intmax |
57 | # define gzbuffer z_gzbuffer | 59 | # define gz_strwinerror z_gz_strwinerror |
58 | # define gzclearerr z_gzclearerr | 60 | # define gzbuffer z_gzbuffer |
59 | # define gzclose z_gzclose | 61 | # define gzclearerr z_gzclearerr |
60 | # define gzclose_r z_gzclose_r | 62 | # define gzclose z_gzclose |
61 | # define gzclose_w z_gzclose_w | 63 | # define gzclose_r z_gzclose_r |
62 | # define gzdirect z_gzdirect | 64 | # define gzclose_w z_gzclose_w |
63 | # define gzdopen z_gzdopen | 65 | # define gzdirect z_gzdirect |
64 | # define gzeof z_gzeof | 66 | # define gzdopen z_gzdopen |
65 | # define gzerror z_gzerror | 67 | # define gzeof z_gzeof |
66 | # define gzflags z_gzflags | 68 | # define gzerror z_gzerror |
67 | # define gzflush z_gzflush | 69 | # define gzflags z_gzflags |
68 | # define gzgetc z_gzgetc | 70 | # define gzflush z_gzflush |
69 | # define gzgetc_ z_gzgetc_ | 71 | # define gzgetc z_gzgetc |
70 | # define gzgets z_gzgets | 72 | # define gzgetc_ z_gzgetc_ |
71 | # define gzoffset z_gzoffset | 73 | # define gzgets z_gzgets |
72 | # define gzoffset64 z_gzoffset64 | 74 | # define gzoffset z_gzoffset |
73 | # define gzopen z_gzopen | 75 | # define gzoffset64 z_gzoffset64 |
74 | # define gzopen64 z_gzopen64 | 76 | # define gzopen z_gzopen |
75 | # define gzprintf z_gzprintf | 77 | # define gzopen64 z_gzopen64 |
76 | # define gzputc z_gzputc | 78 | # define gzprintf z_gzprintf |
77 | # define gzputs z_gzputs | 79 | # define gzputc z_gzputc |
78 | # define gzread z_gzread | 80 | # define gzputs z_gzputs |
79 | # define gzrewind z_gzrewind | 81 | # define gzread z_gzread |
80 | # define gzseek z_gzseek | 82 | # define gzrewind z_gzrewind |
81 | # define gzseek64 z_gzseek64 | 83 | # define gzseek z_gzseek |
82 | # define gzsetparams z_gzsetparams | 84 | # define gzseek64 z_gzseek64 |
83 | # define gztell z_gztell | 85 | # define gzsetparams z_gzsetparams |
84 | # define gztell64 z_gztell64 | 86 | # define gztell z_gztell |
85 | # define gzungetc z_gzungetc | 87 | # define gztell64 z_gztell64 |
86 | # define gzwrite z_gzwrite | 88 | # define gzungetc z_gzungetc |
89 | # define gzwrite z_gzwrite | ||
90 | # endif | ||
87 | # define inflate z_inflate | 91 | # define inflate z_inflate |
88 | # define inflateBack z_inflateBack | 92 | # define inflateBack z_inflateBack |
89 | # define inflateBackEnd z_inflateBackEnd | 93 | # define inflateBackEnd z_inflateBackEnd |
@@ -104,10 +108,14 @@ | |||
104 | # define inflate_copyright z_inflate_copyright | 108 | # define inflate_copyright z_inflate_copyright |
105 | # define inflate_fast z_inflate_fast | 109 | # define inflate_fast z_inflate_fast |
106 | # define inflate_table z_inflate_table | 110 | # define inflate_table z_inflate_table |
107 | # define uncompress z_uncompress | 111 | # ifndef Z_SOLO |
112 | # define uncompress z_uncompress | ||
113 | # endif | ||
108 | # define zError z_zError | 114 | # define zError z_zError |
109 | # define zcalloc z_zcalloc | 115 | # ifndef Z_SOLO |
110 | # define zcfree z_zcfree | 116 | # define zcalloc z_zcalloc |
117 | # define zcfree z_zcfree | ||
118 | # endif | ||
111 | # define zlibCompileFlags z_zlibCompileFlags | 119 | # define zlibCompileFlags z_zlibCompileFlags |
112 | # define zlibVersion z_zlibVersion | 120 | # define zlibVersion z_zlibVersion |
113 | 121 | ||
@@ -117,9 +125,11 @@ | |||
117 | # define alloc_func z_alloc_func | 125 | # define alloc_func z_alloc_func |
118 | # define charf z_charf | 126 | # define charf z_charf |
119 | # define free_func z_free_func | 127 | # define free_func z_free_func |
120 | # define gzFile z_gzFile | 128 | # ifndef Z_SOLO |
121 | # define gz_header z_gz_header | 129 | # define gzFile z_gzFile |
122 | # define gz_headerp z_gz_headerp | 130 | # define gz_header z_gz_header |
131 | # define gz_headerp z_gz_headerp | ||
132 | # endif | ||
123 | # define in_func z_in_func | 133 | # define in_func z_in_func |
124 | # define intf z_intf | 134 | # define intf z_intf |
125 | # define out_func z_out_func | 135 | # define out_func z_out_func |
@@ -132,7 +142,9 @@ | |||
132 | # define voidpf z_voidpf | 142 | # define voidpf z_voidpf |
133 | 143 | ||
134 | /* all zlib structs in zlib.h and zconf.h */ | 144 | /* all zlib structs in zlib.h and zconf.h */ |
135 | # define gz_header_s z_gz_header_s | 145 | # ifndef Z_SOLO |
146 | # define gz_header_s z_gz_header_s | ||
147 | # endif | ||
136 | # define internal_state z_internal_state | 148 | # define internal_state z_internal_state |
137 | 149 | ||
138 | #endif | 150 | #endif |
@@ -379,7 +391,9 @@ typedef uLong FAR uLongf; | |||
379 | #endif | 391 | #endif |
380 | 392 | ||
381 | #ifdef STDC | 393 | #ifdef STDC |
382 | # include <sys/types.h> /* for off_t */ | 394 | # ifndef Z_SOLO |
395 | # include <sys/types.h> /* for off_t */ | ||
396 | # endif | ||
383 | #endif | 397 | #endif |
384 | 398 | ||
385 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and | 399 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and |
@@ -396,7 +410,7 @@ typedef uLong FAR uLongf; | |||
396 | # define Z_LARGE | 410 | # define Z_LARGE |
397 | #endif | 411 | #endif |
398 | 412 | ||
399 | #if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE) | 413 | #if (defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)) && !defined(Z_SOLO) |
400 | # include <unistd.h> /* for SEEK_* and off_t */ | 414 | # include <unistd.h> /* for SEEK_* and off_t */ |
401 | # ifdef VMS | 415 | # ifdef VMS |
402 | # include <unixio.h> /* for off_t */ | 416 | # include <unixio.h> /* for off_t */ |
@@ -406,7 +420,7 @@ typedef uLong FAR uLongf; | |||
406 | # endif | 420 | # endif |
407 | #endif | 421 | #endif |
408 | 422 | ||
409 | #ifndef SEEK_SET | 423 | #if !defined(SEEK_SET) && !defined(Z_SOLO) |
410 | # define SEEK_SET 0 /* Seek from beginning of file. */ | 424 | # define SEEK_SET 0 /* Seek from beginning of file. */ |
411 | # define SEEK_CUR 1 /* Seek from current position. */ | 425 | # define SEEK_CUR 1 /* Seek from current position. */ |
412 | # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ | 426 | # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ |
@@ -28,9 +28,11 @@ | |||
28 | # define adler32 z_adler32 | 28 | # define adler32 z_adler32 |
29 | # define adler32_combine z_adler32_combine | 29 | # define adler32_combine z_adler32_combine |
30 | # define adler32_combine64 z_adler32_combine64 | 30 | # define adler32_combine64 z_adler32_combine64 |
31 | # define compress z_compress | 31 | # ifndef Z_SOLO |
32 | # define compress2 z_compress2 | 32 | # define compress z_compress |
33 | # define compressBound z_compressBound | 33 | # define compress2 z_compress2 |
34 | # define compressBound z_compressBound | ||
35 | # endif | ||
34 | # define crc32 z_crc32 | 36 | # define crc32 z_crc32 |
35 | # define crc32_combine z_crc32_combine | 37 | # define crc32_combine z_crc32_combine |
36 | # define crc32_combine64 z_crc32_combine64 | 38 | # define crc32_combine64 z_crc32_combine64 |
@@ -49,39 +51,41 @@ | |||
49 | # define deflateTune z_deflateTune | 51 | # define deflateTune z_deflateTune |
50 | # define deflate_copyright z_deflate_copyright | 52 | # define deflate_copyright z_deflate_copyright |
51 | # define get_crc_table z_get_crc_table | 53 | # define get_crc_table z_get_crc_table |
52 | # define gz_error z_gz_error | 54 | # ifndef Z_SOLO |
53 | # define gz_intmax z_gz_intmax | 55 | # define gz_error z_gz_error |
54 | # define gz_strwinerror z_gz_strwinerror | 56 | # define gz_intmax z_gz_intmax |
55 | # define gzbuffer z_gzbuffer | 57 | # define gz_strwinerror z_gz_strwinerror |
56 | # define gzclearerr z_gzclearerr | 58 | # define gzbuffer z_gzbuffer |
57 | # define gzclose z_gzclose | 59 | # define gzclearerr z_gzclearerr |
58 | # define gzclose_r z_gzclose_r | 60 | # define gzclose z_gzclose |
59 | # define gzclose_w z_gzclose_w | 61 | # define gzclose_r z_gzclose_r |
60 | # define gzdirect z_gzdirect | 62 | # define gzclose_w z_gzclose_w |
61 | # define gzdopen z_gzdopen | 63 | # define gzdirect z_gzdirect |
62 | # define gzeof z_gzeof | 64 | # define gzdopen z_gzdopen |
63 | # define gzerror z_gzerror | 65 | # define gzeof z_gzeof |
64 | # define gzflags z_gzflags | 66 | # define gzerror z_gzerror |
65 | # define gzflush z_gzflush | 67 | # define gzflags z_gzflags |
66 | # define gzgetc z_gzgetc | 68 | # define gzflush z_gzflush |
67 | # define gzgetc_ z_gzgetc_ | 69 | # define gzgetc z_gzgetc |
68 | # define gzgets z_gzgets | 70 | # define gzgetc_ z_gzgetc_ |
69 | # define gzoffset z_gzoffset | 71 | # define gzgets z_gzgets |
70 | # define gzoffset64 z_gzoffset64 | 72 | # define gzoffset z_gzoffset |
71 | # define gzopen z_gzopen | 73 | # define gzoffset64 z_gzoffset64 |
72 | # define gzopen64 z_gzopen64 | 74 | # define gzopen z_gzopen |
73 | # define gzprintf z_gzprintf | 75 | # define gzopen64 z_gzopen64 |
74 | # define gzputc z_gzputc | 76 | # define gzprintf z_gzprintf |
75 | # define gzputs z_gzputs | 77 | # define gzputc z_gzputc |
76 | # define gzread z_gzread | 78 | # define gzputs z_gzputs |
77 | # define gzrewind z_gzrewind | 79 | # define gzread z_gzread |
78 | # define gzseek z_gzseek | 80 | # define gzrewind z_gzrewind |
79 | # define gzseek64 z_gzseek64 | 81 | # define gzseek z_gzseek |
80 | # define gzsetparams z_gzsetparams | 82 | # define gzseek64 z_gzseek64 |
81 | # define gztell z_gztell | 83 | # define gzsetparams z_gzsetparams |
82 | # define gztell64 z_gztell64 | 84 | # define gztell z_gztell |
83 | # define gzungetc z_gzungetc | 85 | # define gztell64 z_gztell64 |
84 | # define gzwrite z_gzwrite | 86 | # define gzungetc z_gzungetc |
87 | # define gzwrite z_gzwrite | ||
88 | # endif | ||
85 | # define inflate z_inflate | 89 | # define inflate z_inflate |
86 | # define inflateBack z_inflateBack | 90 | # define inflateBack z_inflateBack |
87 | # define inflateBackEnd z_inflateBackEnd | 91 | # define inflateBackEnd z_inflateBackEnd |
@@ -102,10 +106,14 @@ | |||
102 | # define inflate_copyright z_inflate_copyright | 106 | # define inflate_copyright z_inflate_copyright |
103 | # define inflate_fast z_inflate_fast | 107 | # define inflate_fast z_inflate_fast |
104 | # define inflate_table z_inflate_table | 108 | # define inflate_table z_inflate_table |
105 | # define uncompress z_uncompress | 109 | # ifndef Z_SOLO |
110 | # define uncompress z_uncompress | ||
111 | # endif | ||
106 | # define zError z_zError | 112 | # define zError z_zError |
107 | # define zcalloc z_zcalloc | 113 | # ifndef Z_SOLO |
108 | # define zcfree z_zcfree | 114 | # define zcalloc z_zcalloc |
115 | # define zcfree z_zcfree | ||
116 | # endif | ||
109 | # define zlibCompileFlags z_zlibCompileFlags | 117 | # define zlibCompileFlags z_zlibCompileFlags |
110 | # define zlibVersion z_zlibVersion | 118 | # define zlibVersion z_zlibVersion |
111 | 119 | ||
@@ -115,9 +123,11 @@ | |||
115 | # define alloc_func z_alloc_func | 123 | # define alloc_func z_alloc_func |
116 | # define charf z_charf | 124 | # define charf z_charf |
117 | # define free_func z_free_func | 125 | # define free_func z_free_func |
118 | # define gzFile z_gzFile | 126 | # ifndef Z_SOLO |
119 | # define gz_header z_gz_header | 127 | # define gzFile z_gzFile |
120 | # define gz_headerp z_gz_headerp | 128 | # define gz_header z_gz_header |
129 | # define gz_headerp z_gz_headerp | ||
130 | # endif | ||
121 | # define in_func z_in_func | 131 | # define in_func z_in_func |
122 | # define intf z_intf | 132 | # define intf z_intf |
123 | # define out_func z_out_func | 133 | # define out_func z_out_func |
@@ -130,7 +140,9 @@ | |||
130 | # define voidpf z_voidpf | 140 | # define voidpf z_voidpf |
131 | 141 | ||
132 | /* all zlib structs in zlib.h and zconf.h */ | 142 | /* all zlib structs in zlib.h and zconf.h */ |
133 | # define gz_header_s z_gz_header_s | 143 | # ifndef Z_SOLO |
144 | # define gz_header_s z_gz_header_s | ||
145 | # endif | ||
134 | # define internal_state z_internal_state | 146 | # define internal_state z_internal_state |
135 | 147 | ||
136 | #endif | 148 | #endif |
@@ -377,7 +389,9 @@ typedef uLong FAR uLongf; | |||
377 | #endif | 389 | #endif |
378 | 390 | ||
379 | #ifdef STDC | 391 | #ifdef STDC |
380 | # include <sys/types.h> /* for off_t */ | 392 | # ifndef Z_SOLO |
393 | # include <sys/types.h> /* for off_t */ | ||
394 | # endif | ||
381 | #endif | 395 | #endif |
382 | 396 | ||
383 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and | 397 | /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and |
@@ -394,7 +408,7 @@ typedef uLong FAR uLongf; | |||
394 | # define Z_LARGE | 408 | # define Z_LARGE |
395 | #endif | 409 | #endif |
396 | 410 | ||
397 | #if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE) | 411 | #if (defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)) && !defined(Z_SOLO) |
398 | # include <unistd.h> /* for SEEK_* and off_t */ | 412 | # include <unistd.h> /* for SEEK_* and off_t */ |
399 | # ifdef VMS | 413 | # ifdef VMS |
400 | # include <unixio.h> /* for off_t */ | 414 | # include <unixio.h> /* for off_t */ |
@@ -404,7 +418,7 @@ typedef uLong FAR uLongf; | |||
404 | # endif | 418 | # endif |
405 | #endif | 419 | #endif |
406 | 420 | ||
407 | #ifndef SEEK_SET | 421 | #if !defined(SEEK_SET) && !defined(Z_SOLO) |
408 | # define SEEK_SET 0 /* Seek from beginning of file. */ | 422 | # define SEEK_SET 0 /* Seek from beginning of file. */ |
409 | # define SEEK_CUR 1 /* Seek from current position. */ | 423 | # define SEEK_CUR 1 /* Seek from current position. */ |
410 | # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ | 424 | # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ |