- Proper fix for issue with MinGW{-w64} that is independent of header…

… files.
madler · Feb 27, 2024 · 0f56c5a · 0f56c5a
1 parent d162d0f
commit 0f56c5a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/zconf.h b/zconf.h
@@ -511,7 +511,7 @@ typedef uLong FAR uLongf;
 
 #if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
-#elif defined(_WIN32) && !defined(__CYGWIN__)
+#elif defined(_WIN32) || (defined(__GNUC__) && defined(__int64))
 #  define z_off64_t __int64
 #elif defined(__GO32__)
 #  define z_off64_t offset_t

diff --git a/zconf.h.cmakein b/zconf.h.cmakein
@@ -513,7 +513,7 @@ typedef uLong FAR uLongf;
 
 #if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
-#elif defined(_WIN32) && !defined(__CYGWIN__)
+#elif defined(_WIN32) || (defined(__GNUC__) && defined(__int64))
 #  define z_off64_t __int64
 #elif defined(__GO32__)
 #  define z_off64_t offset_t

diff --git a/zconf.h.in b/zconf.h.in
@@ -511,7 +511,7 @@ typedef uLong FAR uLongf;
 
 #if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
-#elif defined(_WIN32) && !defined(__CYGWIN__)
+#elif defined(_WIN32) || (defined(__GNUC__) && defined(__int64))
 #  define z_off64_t __int64
 #elif defined(__GO32__)
 #  define z_off64_t offset_t