From 07d5884828656c3ad397bac867a275b683faac3d Mon Sep 17 00:00:00 2001 From: tb Date: Wed, 27 Mar 2024 10:21:11 +0000 Subject: [PATCH] zlib: sync with upstream The change in zconf.h only affects mingw; The change in inflate.h updates a comment --- lib/libz/inflate.h | 2 +- lib/libz/zconf.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libz/inflate.h b/lib/libz/inflate.h index f127b6b1fa5..f758e0dcc18 100644 --- a/lib/libz/inflate.h +++ b/lib/libz/inflate.h @@ -100,7 +100,7 @@ struct inflate_state { unsigned char FAR *window; /* allocated sliding window, if needed */ /* bit accumulator */ unsigned long hold; /* input bit accumulator */ - unsigned bits; /* number of bits in "in" */ + unsigned bits; /* number of bits in hold */ /* for string and stored block copying */ unsigned length; /* literal or length of data to copy */ unsigned offset; /* distance back to copy string from */ diff --git a/lib/libz/zconf.h b/lib/libz/zconf.h index 0ebaabed7a6..7c289a5009f 100644 --- a/lib/libz/zconf.h +++ b/lib/libz/zconf.h @@ -509,6 +509,8 @@ typedef uLong FAR uLongf; #if !defined(_WIN32) && defined(Z_LARGE64) # define z_off64_t off64_t +#elif defined(__MINGW32__) +# define z_off64_t long long #elif defined(_WIN32) && !defined(__GNUC__) # define z_off64_t __int64 #elif defined(__GO32__) -- 2.20.1