diff options
| author | John M. Schanck <jschanck@mozilla.com> | 2022-04-01 17:41:32 +0000 |
|---|---|---|
| committer | John M. Schanck <jschanck@mozilla.com> | 2022-04-01 17:41:32 +0000 |
| commit | 99edc1108d4fba6cf5c62c48cc2b2434893eb4f1 (patch) | |
| tree | 52bd9895ab839aa98a1733504207215e2facb196 /lib/zlib/zutil.h | |
| parent | 193213a46c19e47e710563301951a1542dbb8a10 (diff) | |
| download | nss-hg-99edc1108d4fba6cf5c62c48cc2b2434893eb4f1.tar.gz | |
Bug 1762489 - Update zlib in NSS to 1.2.12. r=nss-reviewers,djackson
Differential Revision: https://phabricator.services.mozilla.com/D142635
Diffstat (limited to 'lib/zlib/zutil.h')
| -rw-r--r-- | lib/zlib/zutil.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lib/zlib/zutil.h b/lib/zlib/zutil.h index b079ea6a8..d9a20ae1b 100644 --- a/lib/zlib/zutil.h +++ b/lib/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 |