diff --git a/configure b/configure
index f60585b6078884d15abc52ab8772f43b7cd57e60..c4fee2e2e0aa625cb5e2cdc2e2382e6f212bef5d 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/zconf.h b/zconf.h
index 2c22d320c9207ffff482ca658969e9251e11a1a0..ca12b79232bb6ada8a1aeeb06697afa3d501033e 100644
--- 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 */
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 662fc3de6afb22e7c1f41c55158b22689848d894..efd91f7e49e93ef750395684766913c8ae79d475 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 */
diff --git a/zconf.h.in b/zconf.h.in
index 2c22d320c9207ffff482ca658969e9251e11a1a0..ca12b79232bb6ada8a1aeeb06697afa3d501033e 100644
--- 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 */