Fix compile option for when z_size_t needs to be a long long.

8 years ago · 3f8c768745
parent ca50ebd4df
commit 3f8c768745
4 changed files with 7 additions and 1 deletions
--- a/2
+++ b/2
@ -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
--- a/zconf.h
+++ b/zconf.h
@ -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 */
--- 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 */
--- a/zconf.h.in
+++ b/zconf.h.in
@ -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 */