diff options
Diffstat (limited to 'src/Common/zlib/zutil.h')
| -rw-r--r-- | src/Common/zlib/zutil.h | 21 |
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,3 +1,3 @@ /* 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 @@ -31,6 +31,2 @@ -#ifdef Z_SOLO - typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */ -#endif - #ifndef local @@ -48,2 +44,13 @@ 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 */ @@ -172,6 +179,2 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define fdopen(fd,mode) NULL /* No fdopen() */ -# ifndef _PTRDIFF_T_DEFINED - typedef int ptrdiff_t; -# define _PTRDIFF_T_DEFINED -# endif # else |