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 | |
parent | ca50ebd4dfd08dfd7e8c8bb087278e158cd67720 (diff) | |
download | zlib-3f8c768745e85d0e63ba306581710c6dc9db0d65.tar.gz |
Fix compile option for when z_size_t needs to be a long long.
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | zconf.h | 2 | ||||
-rw-r--r-- | zconf.h.cmakein | 2 | ||||
-rw-r--r-- | zconf.h.in | 2 |
4 files changed, 7 insertions, 1 deletions
@@ -491,7 +491,7 @@ EOF int main(void) { if (sizeof(void *) <= sizeof(int)) puts("int"); else if (sizeof(void *) <= sizeof(long)) puts("long"); - else puts("long long"); + else puts("z_longlong"); return 0; } EOF @@ -225,6 +225,7 @@ #endif #ifndef Z_SOLO +# define z_longlong long long # ifdef NO_SIZE_T typedef unsigned NO_SIZE_T z_size_t; # else @@ -237,6 +238,7 @@ # include <sys/types.h> typedef ssize_t z_ssize_t; # endif +# undef z_longlong #endif /* 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 @@ #endif #ifndef Z_SOLO +# define z_longlong long long # ifdef NO_SIZE_T typedef unsigned NO_SIZE_T z_size_t; # else @@ -239,6 +240,7 @@ # include <sys/types.h> typedef ssize_t z_ssize_t; # endif +# undef z_longlong #endif /* Maximum value for memLevel in deflateInit2 */ @@ -225,6 +225,7 @@ #endif #ifndef Z_SOLO +# define z_longlong long long # ifdef NO_SIZE_T typedef unsigned NO_SIZE_T z_size_t; # else @@ -237,6 +238,7 @@ # include <sys/types.h> typedef ssize_t z_ssize_t; # endif +# undef z_longlong #endif /* Maximum value for memLevel in deflateInit2 */ |