diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2016-12-04 16:50:49 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2016-12-04 17:19:36 -0800 |
| commit | 3f8c768745e85d0e63ba306581710c6dc9db0d65 (patch) | |
| tree | 92ffb0e6fa13bed577a608c1c3cbcd8fdc2c4564 /zconf.h | |
| parent | ca50ebd4dfd08dfd7e8c8bb087278e158cd67720 (diff) | |
| download | zlib-3f8c768745e85d0e63ba306581710c6dc9db0d65.tar.gz zlib-3f8c768745e85d0e63ba306581710c6dc9db0d65.tar.bz2 zlib-3f8c768745e85d0e63ba306581710c6dc9db0d65.zip | |
Fix compile option for when z_size_t needs to be a long long.
Diffstat (limited to '')
| -rw-r--r-- | zconf.h | 2 | ||||
| -rw-r--r-- | zconf.h.cmakein | 2 | ||||
| -rw-r--r-- | zconf.h.in | 2 |
3 files changed, 6 insertions, 0 deletions
| @@ -225,6 +225,7 @@ | |||
| 225 | #endif | 225 | #endif |
| 226 | 226 | ||
| 227 | #ifndef Z_SOLO | 227 | #ifndef Z_SOLO |
| 228 | # define z_longlong long long | ||
| 228 | # ifdef NO_SIZE_T | 229 | # ifdef NO_SIZE_T |
| 229 | typedef unsigned NO_SIZE_T z_size_t; | 230 | typedef unsigned NO_SIZE_T z_size_t; |
| 230 | # else | 231 | # else |
| @@ -237,6 +238,7 @@ | |||
| 237 | # include <sys/types.h> | 238 | # include <sys/types.h> |
| 238 | typedef ssize_t z_ssize_t; | 239 | typedef ssize_t z_ssize_t; |
| 239 | # endif | 240 | # endif |
| 241 | # undef z_longlong | ||
| 240 | #endif | 242 | #endif |
| 241 | 243 | ||
| 242 | /* Maximum value for memLevel in deflateInit2 */ | 244 | /* Maximum value for memLevel in deflateInit2 */ |
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index 662fc3d..efd91f7 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein | |||
| @@ -227,6 +227,7 @@ | |||
| 227 | #endif | 227 | #endif |
| 228 | 228 | ||
| 229 | #ifndef Z_SOLO | 229 | #ifndef Z_SOLO |
| 230 | # define z_longlong long long | ||
| 230 | # ifdef NO_SIZE_T | 231 | # ifdef NO_SIZE_T |
| 231 | typedef unsigned NO_SIZE_T z_size_t; | 232 | typedef unsigned NO_SIZE_T z_size_t; |
| 232 | # else | 233 | # else |
| @@ -239,6 +240,7 @@ | |||
| 239 | # include <sys/types.h> | 240 | # include <sys/types.h> |
| 240 | typedef ssize_t z_ssize_t; | 241 | typedef ssize_t z_ssize_t; |
| 241 | # endif | 242 | # endif |
| 243 | # undef z_longlong | ||
| 242 | #endif | 244 | #endif |
| 243 | 245 | ||
| 244 | /* Maximum value for memLevel in deflateInit2 */ | 246 | /* Maximum value for memLevel in deflateInit2 */ |
| @@ -225,6 +225,7 @@ | |||
| 225 | #endif | 225 | #endif |
| 226 | 226 | ||
| 227 | #ifndef Z_SOLO | 227 | #ifndef Z_SOLO |
| 228 | # define z_longlong long long | ||
| 228 | # ifdef NO_SIZE_T | 229 | # ifdef NO_SIZE_T |
| 229 | typedef unsigned NO_SIZE_T z_size_t; | 230 | typedef unsigned NO_SIZE_T z_size_t; |
| 230 | # else | 231 | # else |
| @@ -237,6 +238,7 @@ | |||
| 237 | # include <sys/types.h> | 238 | # include <sys/types.h> |
| 238 | typedef ssize_t z_ssize_t; | 239 | typedef ssize_t z_ssize_t; |
| 239 | # endif | 240 | # endif |
| 241 | # undef z_longlong | ||
| 240 | #endif | 242 | #endif |
| 241 | 243 | ||
| 242 | /* Maximum value for memLevel in deflateInit2 */ | 244 | /* Maximum value for memLevel in deflateInit2 */ |