X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flibchdr%2Fdeps%2Fzlib-1.3.1%2Fzconf.h.cmakein;fp=deps%2Flibchdr%2Fdeps%2Fzlib-1.2.13%2Fzconf.h.cmakein;h=0abe3bc9d8fa4ec2878fdaf3f2a72994315e52fe;hb=648db22b0750712da893c306efcc8e4b2d3a4e3c;hp=247ba2461dd09e6ee8b59058ef697f9443a359bf;hpb=e2fb1389dc12376acb84e4993ed3b08760257252;p=pcsx_rearmed.git

diff --git a/deps/libchdr/deps/zlib-1.2.13/zconf.h.cmakein b/deps/libchdr/deps/zlib-1.3.1/zconf.h.cmakein
similarity index 98%
rename from deps/libchdr/deps/zlib-1.2.13/zconf.h.cmakein
rename to deps/libchdr/deps/zlib-1.3.1/zconf.h.cmakein
index 247ba246..0abe3bc9 100644
--- a/deps/libchdr/deps/zlib-1.2.13/zconf.h.cmakein
+++ b/deps/libchdr/deps/zlib-1.3.1/zconf.h.cmakein
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -243,7 +243,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)
@@ -298,14 +302,6 @@
 #  endif
 #endif
 
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
@@ -522,7 +518,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