Avoid using __int64 for gcc or solo compilation.

80f3e39e · Mark Adler · 3f4339b6 · 80f3e39e · 80f3e39e · 80f3e39e
隐藏空白更改
内联并排

Showing with 9 addition and 9 deletion

zconf.h zconf.h +3 -3

zconf.h.cmakein zconf.h.cmakein +3 -3

zconf.h.in zconf.h.in +3 -3

未找到文件。
--- a/zconf.h
+++ b/zconf.h
@@ -439,11 +439,11 @@ typedef uLong FAR uLongf;
 #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32)
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
 #    define z_off64_t __int64
 #  else
-#  define z_off64_t z_off_t
-#endif
+#    define z_off64_t z_off_t
+#  endif
 #endif

 /* MVS linker does not support external names larger than 8 bytes */

--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -441,11 +441,11 @@ typedef uLong FAR uLongf;
 #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32)
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
 #    define z_off64_t __int64
 #  else
-#  define z_off64_t z_off_t
-#endif
+#    define z_off64_t z_off_t
+#  endif
 #endif

 /* MVS linker does not support external names larger than 8 bytes */

--- a/zconf.h.in
+++ b/zconf.h.in
@@ -439,11 +439,11 @@ typedef uLong FAR uLongf;
 #if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32)
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
 #    define z_off64_t __int64
 #  else
-#  define z_off64_t z_off_t
-#endif
+#    define z_off64_t z_off_t
+#  endif
 #endif

 /* MVS linker does not support external names larger than 8 bytes */