aboutsummaryrefslogtreecommitdiff
path: root/zconf.h.in
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2023-01-25 21:00:52 -0800
committerMark Adler <madler@alumni.caltech.edu>2023-01-25 21:00:52 -0800
commitfa8cd50ada68b873c754766bc73b12080b7b309e (patch)
treecaf5c8574ceb7211478a3d4f2df7fc1bcebe3da5 /zconf.h.in
parenta9b4c1de37bb1962048a6a83658479c3902ca9f8 (diff)
downloadzlib-fa8cd50ada68b873c754766bc73b12080b7b309e.tar.gz
zlib-fa8cd50ada68b873c754766bc73b12080b7b309e.tar.bz2
zlib-fa8cd50ada68b873c754766bc73b12080b7b309e.zip
Make z_size_t 64 bits when compiling on Windows with Z_SOLO.
Z_SOLO defines z_size_t as an unsigned long. However Windows and MinGW-w64 are LLP64, where a long is 32 bits, but a size_t is 64 bits. This makes z_size_t, used by adler32_z() and crc32_z(), 64 bits on those systems.
Diffstat (limited to 'zconf.h.in')
-rw-r--r--zconf.h.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/zconf.h.in b/zconf.h.in
index bf977d3..5733ed6 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -241,7 +241,11 @@
241#endif 241#endif
242 242
243#ifdef Z_SOLO 243#ifdef Z_SOLO
244 typedef unsigned long z_size_t; 244# ifdef _WIN64
245 typedef unsigned long long z_size_t;
246# else
247 typedef unsigned long z_size_t;
248# endif
245#else 249#else
246# define z_longlong long long 250# define z_longlong long long
247# if defined(NO_SIZE_T) 251# if defined(NO_SIZE_T)