From 4f92ba548445e84bab61e06f89ee1e341a92f716 Mon Sep 17 00:00:00 2001
From: DLL125 <134442578+DLL125@users.noreply.github.com>
Date: Sun, 20 Aug 2023 09:21:54 +0200
Subject: Update zlib to latest (#1181)

* Update zlib to latest

* Update copyright

Updated copyright of zlib.
---
 src/Common/zlib/zconf.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/Common/zlib/zconf.h')

diff --git a/src/Common/zlib/zconf.h b/src/Common/zlib/zconf.h
index bf977d3e..fb76ffe3 100644
--- a/src/Common/zlib/zconf.h
+++ b/src/Common/zlib/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(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
-- 
cgit v1.2.3