diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-02-01 22:41:52 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-02-01 23:04:20 -0800 |
| commit | a8d23bb675e05cfc0cc70ddc8ea03dbbf0e49fb8 (patch) | |
| tree | b60f2df5cadf8daee944699a2bb8a513c36e89ce | |
| parent | 98e5787e1b22c2f974e3e80eda135abe7e008251 (diff) | |
| download | zlib-a8d23bb675e05cfc0cc70ddc8ea03dbbf0e49fb8.tar.gz zlib-a8d23bb675e05cfc0cc70ddc8ea03dbbf0e49fb8.tar.bz2 zlib-a8d23bb675e05cfc0cc70ddc8ea03dbbf0e49fb8.zip | |
Include gz_header definition when compiling zlib solo.
| -rw-r--r-- | zconf.h | 8 | ||||
| -rw-r--r-- | zconf.h.cmakein | 8 | ||||
| -rw-r--r-- | zconf.h.in | 8 |
3 files changed, 9 insertions, 15 deletions
| @@ -127,9 +127,9 @@ | |||
| 127 | # define free_func z_free_func | 127 | # define free_func z_free_func |
| 128 | # ifndef Z_SOLO | 128 | # ifndef Z_SOLO |
| 129 | # define gzFile z_gzFile | 129 | # define gzFile z_gzFile |
| 130 | # define gz_header z_gz_header | ||
| 131 | # define gz_headerp z_gz_headerp | ||
| 132 | # endif | 130 | # endif |
| 131 | # define gz_header z_gz_header | ||
| 132 | # define gz_headerp z_gz_headerp | ||
| 133 | # define in_func z_in_func | 133 | # define in_func z_in_func |
| 134 | # define intf z_intf | 134 | # define intf z_intf |
| 135 | # define out_func z_out_func | 135 | # define out_func z_out_func |
| @@ -142,9 +142,7 @@ | |||
| 142 | # define voidpf z_voidpf | 142 | # define voidpf z_voidpf |
| 143 | 143 | ||
| 144 | /* all zlib structs in zlib.h and zconf.h */ | 144 | /* all zlib structs in zlib.h and zconf.h */ |
| 145 | # ifndef Z_SOLO | 145 | # define gz_header_s z_gz_header_s |
| 146 | # define gz_header_s z_gz_header_s | ||
| 147 | # endif | ||
| 148 | # define internal_state z_internal_state | 146 | # define internal_state z_internal_state |
| 149 | 147 | ||
| 150 | #endif | 148 | #endif |
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index 3ea5531..325f93c 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein | |||
| @@ -129,9 +129,9 @@ | |||
| 129 | # define free_func z_free_func | 129 | # define free_func z_free_func |
| 130 | # ifndef Z_SOLO | 130 | # ifndef Z_SOLO |
| 131 | # define gzFile z_gzFile | 131 | # define gzFile z_gzFile |
| 132 | # define gz_header z_gz_header | ||
| 133 | # define gz_headerp z_gz_headerp | ||
| 134 | # endif | 132 | # endif |
| 133 | # define gz_header z_gz_header | ||
| 134 | # define gz_headerp z_gz_headerp | ||
| 135 | # define in_func z_in_func | 135 | # define in_func z_in_func |
| 136 | # define intf z_intf | 136 | # define intf z_intf |
| 137 | # define out_func z_out_func | 137 | # define out_func z_out_func |
| @@ -144,9 +144,7 @@ | |||
| 144 | # define voidpf z_voidpf | 144 | # define voidpf z_voidpf |
| 145 | 145 | ||
| 146 | /* all zlib structs in zlib.h and zconf.h */ | 146 | /* all zlib structs in zlib.h and zconf.h */ |
| 147 | # ifndef Z_SOLO | 147 | # define gz_header_s z_gz_header_s |
| 148 | # define gz_header_s z_gz_header_s | ||
| 149 | # endif | ||
| 150 | # define internal_state z_internal_state | 148 | # define internal_state z_internal_state |
| 151 | 149 | ||
| 152 | #endif | 150 | #endif |
| @@ -127,9 +127,9 @@ | |||
| 127 | # define free_func z_free_func | 127 | # define free_func z_free_func |
| 128 | # ifndef Z_SOLO | 128 | # ifndef Z_SOLO |
| 129 | # define gzFile z_gzFile | 129 | # define gzFile z_gzFile |
| 130 | # define gz_header z_gz_header | ||
| 131 | # define gz_headerp z_gz_headerp | ||
| 132 | # endif | 130 | # endif |
| 131 | # define gz_header z_gz_header | ||
| 132 | # define gz_headerp z_gz_headerp | ||
| 133 | # define in_func z_in_func | 133 | # define in_func z_in_func |
| 134 | # define intf z_intf | 134 | # define intf z_intf |
| 135 | # define out_func z_out_func | 135 | # define out_func z_out_func |
| @@ -142,9 +142,7 @@ | |||
| 142 | # define voidpf z_voidpf | 142 | # define voidpf z_voidpf |
| 143 | 143 | ||
| 144 | /* all zlib structs in zlib.h and zconf.h */ | 144 | /* all zlib structs in zlib.h and zconf.h */ |
| 145 | # ifndef Z_SOLO | 145 | # define gz_header_s z_gz_header_s |
| 146 | # define gz_header_s z_gz_header_s | ||
| 147 | # endif | ||
| 148 | # define internal_state z_internal_state | 146 | # define internal_state z_internal_state |
| 149 | 147 | ||
| 150 | #endif | 148 | #endif |