Update 2 packages

mingw-w64-i686-zlib (1.2.13-3 -> 1.3-1) mingw-w64-x86_64-zlib (1.2.13-3 -> 1.3-1) Signed-off-by: Git for Windows Build Agent <ci@git-for-windows.build>
git-for-windows · Aug 20, 2023 · bdd233f · bdd233f
1 parent 1d07c6a
commit bdd233f
Show file tree

Hide file tree

Showing 35 changed files with 407 additions and 393 deletions.
diff --git a/mingw32/bin/zlib1.dll b/mingw32/bin/zlib1.dll
diff --git a/mingw32/include/zconf.h b/mingw32/include/zconf.h
@@ -241,7 +241,11 @@
 #endif
 
 #ifdef Z_SOLO
-   typedef unsigned long z_size_t;
+#  ifdef _WIN64
+     typedef unsigned long long z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
 #else
 #  define z_longlong long long
 #  if defined(NO_SIZE_T)
@@ -520,7 +524,7 @@ typedef uLong FAR uLongf;
 #if (defined(_WIN32) && defined(__GNUC__) && defined(_LARGEFILE64_SOURCE)) || defined(Z_LARGE64)
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#  if defined(_WIN32) && !defined(__GNUC__)
 #    define z_off64_t __int64
 #  else
 #    define z_off64_t z_off_t

diff --git a/mingw32/include/zlib.h b/mingw32/include/zlib.h
diff --git a/mingw32/lib/libz.a b/mingw32/lib/libz.a
diff --git a/mingw32/lib/pkgconfig/zlib.pc b/mingw32/lib/pkgconfig/zlib.pc
@@ -6,7 +6,7 @@ includedir=${prefix}/include
 
 Name: zlib
 Description: zlib compression library
-Version: 1.2.13
+Version: 1.3
 
 Requires:
 Libs: -L${libdir} -lz

diff --git a/mingw32/share/man/man3/zlib.3.gz b/mingw32/share/man/man3/zlib.3.gz
diff --git a/mingw64/bin/zlib1.dll b/mingw64/bin/zlib1.dll
diff --git a/mingw64/include/zconf.h b/mingw64/include/zconf.h
@@ -241,7 +241,11 @@
 #endif
 
 #ifdef Z_SOLO
-   typedef unsigned long z_size_t;
+#  ifdef _WIN64
+     typedef unsigned long long z_size_t;
+#  else
+     typedef unsigned long z_size_t;
+#  endif
 #else
 #  define z_longlong long long
 #  if defined(NO_SIZE_T)
@@ -520,7 +524,7 @@ typedef uLong FAR uLongf;
 #if (defined(_WIN32) && defined(__GNUC__) && defined(_LARGEFILE64_SOURCE)) || defined(Z_LARGE64)
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#  if defined(_WIN32) && !defined(__GNUC__)
 #    define z_off64_t __int64
 #  else
 #    define z_off64_t z_off_t