diff options
| author | DLL125 <134442578+DLL125@users.noreply.github.com> | 2023-08-20 09:21:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-20 09:21:54 +0200 |
| commit | 4f92ba548445e84bab61e06f89ee1e341a92f716 (patch) | |
| tree | c4409ca025048e7b6f99555b22b026ec5898e06e /src/Common/zlib/zconf.h | |
| parent | 89d340271c4d584b649eb9974f15a1ee557c91a1 (diff) | |
| download | VeraCrypt-4f92ba548445e84bab61e06f89ee1e341a92f716.tar.gz VeraCrypt-4f92ba548445e84bab61e06f89ee1e341a92f716.zip | |
Update zlib to latest (#1181)
* Update zlib to latest
* Update copyright
Updated copyright of zlib.
Diffstat (limited to 'src/Common/zlib/zconf.h')
| -rw-r--r-- | src/Common/zlib/zconf.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Common/zlib/zconf.h b/src/Common/zlib/zconf.h index bf977d3e..fb76ffe3 100644 --- a/src/Common/zlib/zconf.h +++ b/src/Common/zlib/zconf.h @@ -241,7 +241,11 @@ #endif #ifdef Z_SOLO - typedef unsigned long z_size_t; +# ifdef _WIN64 + typedef unsigned long long z_size_t; +# else + typedef unsigned long z_size_t; +# endif #else # define z_longlong long long # if defined(NO_SIZE_T) @@ -520,7 +524,7 @@ typedef uLong FAR uLongf; #if !defined(_WIN32) && defined(Z_LARGE64) # define z_off64_t off64_t #else -# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO) +# if defined(_WIN32) && !defined(__GNUC__) # define z_off64_t __int64 # else # define z_off64_t z_off_t |