summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/zlib/zutil.h
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2022-04-14 10:39:41 +1000
committer Vas Crabb <vas@vastheman.com>2022-04-14 10:39:41 +1000
commit6fa1f03bf0aa00885699da44828a68b4881fd64b (patch)
tree64359def73a4113c2317bf39dfbc73397b712b4d /3rdparty/zlib/zutil.h
parent23904ffeebcd91310715045ab39f24390799edf3 (diff)
3rdparty: Updated zlib to version 1.2.12.
Diffstat (limited to '3rdparty/zlib/zutil.h')
-rw-r--r--3rdparty/zlib/zutil.h21
1 files changed, 12 insertions, 9 deletions
diff --git a/3rdparty/zlib/zutil.h b/3rdparty/zlib/zutil.h
index b079ea6a80f..d9a20ae1bf4 100644
--- a/3rdparty/zlib/zutil.h
+++ b/3rdparty/zlib/zutil.h
@@ -1,5 +1,5 @@
/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+ * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -29,10 +29,6 @@
# include <stdlib.h>
#endif
-#ifdef Z_SOLO
- typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
-#endif
-
#ifndef local
# define local static
#endif
@@ -46,6 +42,17 @@ typedef unsigned short ush;
typedef ush FAR ushf;
typedef unsigned long ulg;
+#if !defined(Z_U8) && !defined(Z_SOLO) && defined(STDC)
+# include <limits.h>
+# if (ULONG_MAX == 0xffffffffffffffff)
+# define Z_U8 unsigned long
+# elif (ULLONG_MAX == 0xffffffffffffffff)
+# define Z_U8 unsigned long long
+# elif (UINT_MAX == 0xffffffffffffffff)
+# define Z_U8 unsigned
+# endif
+#endif
+
extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
/* (size given to avoid silly warnings with Visual C++) */
@@ -170,10 +177,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
# if defined(_WIN32_WCE)
# define fdopen(fd,mode) NULL /* No fdopen() */
-# ifndef _PTRDIFF_T_DEFINED
- typedef int ptrdiff_t;
-# define _PTRDIFF_T_DEFINED
-# endif
# else
# define fdopen(fd,type) _fdopen(fd,type)
# endif