Skip to content

Commit 1382b88

Browse files
committed
Fix z_size_t definition:
- Zlib Compat: Move definition of z_size_t to zconf.h, so it is exported to applications. Always defined as size_t to follow zlib 1.2.13 behavior with STDC compilers. - Zlib-NG: Keeps internal definition of z_size_t in zbuild.h
1 parent c211d11 commit 1382b88

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

zbuild.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,6 @@
8888
# define PREFIX3(x) z_ ## x
8989
# define PREFIX4(x) x ## 64
9090
# define zVersion zlibVersion
91-
# if defined(_WIN64)
92-
# define z_size_t unsigned __int64
93-
# else
94-
# define z_size_t unsigned long
95-
# endif
9691
#else
9792
# define PREFIX(x) zng_ ## x
9893
# define PREFIX2(x) ZLIBNG_ ## x

zconf.h.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
# define z_const
2626
#endif
2727

28+
typedef size_t z_size_t;
29+
2830
/* Maximum value for memLevel in deflateInit2 */
2931
#ifndef MAX_MEM_LEVEL
3032
# define MAX_MEM_LEVEL 9

0 commit comments

Comments
 (0)