diff options
| author | Wendigo <84196391+wendig0x@users.noreply.github.com> | 2023-05-19 23:15:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-19 22:15:01 +0200 |
| commit | 8fc866df4070e23ec0cc88a84c8ecfd456dfb30d (patch) | |
| tree | 6673d7677b0a25d0d656d92febaeca6194e0b1ed /src/Common/zlib/zconf.h | |
| parent | 21918e33b66f371952ebed20f3b13317e8a94831 (diff) | |
| download | VeraCrypt-8fc866df4070e23ec0cc88a84c8ecfd456dfb30d.tar.gz VeraCrypt-8fc866df4070e23ec0cc88a84c8ecfd456dfb30d.zip | |
update zlib to latest version 1.2.13 (#986)
Diffstat (limited to 'src/Common/zlib/zconf.h')
| -rw-r--r-- | src/Common/zlib/zconf.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/Common/zlib/zconf.h b/src/Common/zlib/zconf.h index 5e1d68a0..bf977d3e 100644 --- a/src/Common/zlib/zconf.h +++ b/src/Common/zlib/zconf.h @@ -38,6 +38,9 @@ # define crc32 z_crc32 # define crc32_combine z_crc32_combine # define crc32_combine64 z_crc32_combine64 +# define crc32_combine_gen z_crc32_combine_gen +# define crc32_combine_gen64 z_crc32_combine_gen64 +# define crc32_combine_op z_crc32_combine_op # define crc32_z z_crc32_z # define deflate z_deflate # define deflateBound z_deflateBound @@ -349,6 +352,9 @@ # ifdef FAR # undef FAR # endif +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif # include <windows.h> /* No need for _export, use ZLIB.DEF instead. */ /* For complete Windows compatibility, use WINAPI, not __stdcall. */ @@ -467,11 +473,18 @@ typedef uLong FAR uLongf; # undef _LARGEFILE64_SOURCE #endif -#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H) -# define Z_HAVE_UNISTD_H +#ifndef Z_HAVE_UNISTD_H +# ifdef __WATCOMC__ +# define Z_HAVE_UNISTD_H +# endif +#endif +#ifndef Z_HAVE_UNISTD_H +# if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32) +# define Z_HAVE_UNISTD_H +# endif #endif #ifndef Z_SOLO -# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) +# if defined(Z_HAVE_UNISTD_H) # include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ # ifdef VMS # include <unixio.h> /* for off_t */ |