diff options
| author | DLL125 <134442578+DLL125@users.noreply.github.com> | 2024-04-10 18:47:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 18:47:29 +0200 |
| commit | ecf1047019190d07468489d2dfd2fdc56c092e26 (patch) | |
| tree | 539c0290be9f1d8ddc4dc2a8ce51be6d7707383c /src/Common/zlib/zutil.h | |
| parent | ce2a254c51cdd14f9087142391185156e3cc6eac (diff) | |
| download | VeraCrypt-ecf1047019190d07468489d2dfd2fdc56c092e26.tar.gz VeraCrypt-ecf1047019190d07468489d2dfd2fdc56c092e26.zip | |
update zlib + copyright (#1302)
Diffstat (limited to 'src/Common/zlib/zutil.h')
| -rw-r--r-- | src/Common/zlib/zutil.h | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/src/Common/zlib/zutil.h b/src/Common/zlib/zutil.h index 902a304c..48dd7feb 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-2022 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 */ @@ -56,7 +56,7 @@ typedef unsigned long ulg; extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* (size given to avoid silly warnings with Visual C++) */ -#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] +#define ERR_MSG(err) z_errmsg[(err) < -6 || (err) > 2 ? 9 : 2 - (err)] #define ERR_RETURN(strm,err) \ return (strm->msg = ERR_MSG(err), (err)) @@ -137,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # endif #endif -#if defined(MACOS) || defined(TARGET_OS_MAC) +#if defined(MACOS) # define OS_CODE 7 -# ifndef Z_SOLO -# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os -# include <unix.h> /* for fdopen */ -# else -# ifndef fdopen -# define fdopen(fd,mode) NULL /* No fdopen() */ -# endif -# endif -# endif #endif #ifdef __acorn @@ -170,18 +161,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define OS_CODE 19 #endif -#if defined(_BEOS_) || defined(RISCOS) -# define fdopen(fd,mode) NULL /* No fdopen() */ -#endif - -#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX -# if defined(_WIN32_WCE) -# define fdopen(fd,mode) NULL /* No fdopen() */ -# else -# define fdopen(fd,type) _fdopen(fd,type) -# endif -#endif - #if defined(__BORLANDC__) && !defined(MSDOS) #pragma warn -8004 #pragma warn -8008 |