VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/zlib/zutil.h
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2022-03-31 00:50:51 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2022-03-31 00:52:40 +0200
commit08716954031eb0329fbd1ad2cd3fa593d3a046ab (patch)
tree48683dcf0639fbe7b84e00ea02dacaa4de9fe577 /src/Common/zlib/zutil.h
parent2be0b2e88ffebf9b63dcda4048ab0a24cd6ec131 (diff)
downloadVeraCrypt-08716954031eb0329fbd1ad2cd3fa593d3a046ab.tar.gz
VeraCrypt-08716954031eb0329fbd1ad2cd3fa593d3a046ab.zip
Update zlib to version 1.2.12
Diffstat (limited to 'src/Common/zlib/zutil.h')
-rw-r--r--src/Common/zlib/zutil.h21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/Common/zlib/zutil.h b/src/Common/zlib/zutil.h
index b079ea6a..d9a20ae1 100644
--- a/src/Common/zlib/zutil.h
+++ b/src/Common/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