diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-08-29 11:02:34 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-08-29 11:02:34 +0200 |
| commit | e0e1f2e4a2056db1a908af75612daaaf5b129ebd (patch) | |
| tree | 49b45c6c5609f07b93fe3b30f531b8cc76d92565 /thirdparty/zlib/zconf.h | |
| parent | 541674d10692cf608f1245d7eede459bdc96b74f (diff) | |
| download | redot-engine-e0e1f2e4a2056db1a908af75612daaaf5b129ebd.tar.gz | |
zlib/minizip: Update to version 1.3
Upstreams the fix from #73310, so we can remove that patch.
Remove `infback.c` which we stopped compiling after #79273.
The `OF` macro was also removed so I can drop the patch where I yell
at Gentoo developers.
Diffstat (limited to 'thirdparty/zlib/zconf.h')
| -rw-r--r-- | thirdparty/zlib/zconf.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/thirdparty/zlib/zconf.h b/thirdparty/zlib/zconf.h index bf977d3e70..fb76ffe312 100644 --- a/thirdparty/zlib/zconf.h +++ b/thirdparty/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 |