Skip to content

Commit 50dca6d

Browse files
madlermadler
committed
Fix init macros to use z_ prefix when requested.
1 parent d6f0da2 commit 50dca6d

File tree

4 files changed

+47
-16
lines changed

4 files changed

+47
-16
lines changed

‎zconf.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
1818
# define Z_PREFIX_SET
1919

20-
/* all linked symbols */
20+
/* all linked symbols and init macros */
2121
# define _dist_code z__dist_code
2222
# define _length_code z__length_code
2323
# define _tr_align z__tr_align
@@ -41,6 +41,8 @@
4141
# define deflateBound z_deflateBound
4242
# define deflateCopy z_deflateCopy
4343
# define deflateEnd z_deflateEnd
44+
# define deflateInit z_deflateInit
45+
# define deflateInit2 z_deflateInit2
4446
# define deflateInit2_ z_deflateInit2_
4547
# define deflateInit_ z_deflateInit_
4648
# define deflateParams z_deflateParams
@@ -94,10 +96,13 @@
9496
# define inflate z_inflate
9597
# define inflateBack z_inflateBack
9698
# define inflateBackEnd z_inflateBackEnd
99+
# define inflateBackInit z_inflateBackInit
97100
# define inflateBackInit_ z_inflateBackInit_
98101
# define inflateCopy z_inflateCopy
99102
# define inflateEnd z_inflateEnd
100103
# define inflateGetHeader z_inflateGetHeader
104+
# define inflateInit z_inflateInit
105+
# define inflateInit2 z_inflateInit2
101106
# define inflateInit2_ z_inflateInit2_
102107
# define inflateInit_ z_inflateInit_
103108
# define inflateMark z_inflateMark

‎zconf.h.cmakein‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
2020
# define Z_PREFIX_SET
2121

22-
/* all linked symbols */
22+
/* all linked symbols and init macros */
2323
# define _dist_code z__dist_code
2424
# define _length_code z__length_code
2525
# define _tr_align z__tr_align
@@ -43,6 +43,8 @@
4343
# define deflateBound z_deflateBound
4444
# define deflateCopy z_deflateCopy
4545
# define deflateEnd z_deflateEnd
46+
# define deflateInit z_deflateInit
47+
# define deflateInit2 z_deflateInit2
4648
# define deflateInit2_ z_deflateInit2_
4749
# define deflateInit_ z_deflateInit_
4850
# define deflateParams z_deflateParams
@@ -96,10 +98,13 @@
9698
# define inflate z_inflate
9799
# define inflateBack z_inflateBack
98100
# define inflateBackEnd z_inflateBackEnd
101+
# define inflateBackInit z_inflateBackInit
99102
# define inflateBackInit_ z_inflateBackInit_
100103
# define inflateCopy z_inflateCopy
101104
# define inflateEnd z_inflateEnd
102105
# define inflateGetHeader z_inflateGetHeader
106+
# define inflateInit z_inflateInit
107+
# define inflateInit2 z_inflateInit2
103108
# define inflateInit2_ z_inflateInit2_
104109
# define inflateInit_ z_inflateInit_
105110
# define inflateMark z_inflateMark

‎zconf.h.in‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
1818
# define Z_PREFIX_SET
1919

20-
/* all linked symbols */
20+
/* all linked symbols and init macros */
2121
# define _dist_code z__dist_code
2222
# define _length_code z__length_code
2323
# define _tr_align z__tr_align
@@ -41,6 +41,8 @@
4141
# define deflateBound z_deflateBound
4242
# define deflateCopy z_deflateCopy
4343
# define deflateEnd z_deflateEnd
44+
# define deflateInit z_deflateInit
45+
# define deflateInit2 z_deflateInit2
4446
# define deflateInit2_ z_deflateInit2_
4547
# define deflateInit_ z_deflateInit_
4648
# define deflateParams z_deflateParams
@@ -94,10 +96,13 @@
9496
# define inflate z_inflate
9597
# define inflateBack z_inflateBack
9698
# define inflateBackEnd z_inflateBackEnd
99+
# define inflateBackInit z_inflateBackInit
97100
# define inflateBackInit_ z_inflateBackInit_
98101
# define inflateCopy z_inflateCopy
99102
# define inflateEnd z_inflateEnd
100103
# define inflateGetHeader z_inflateGetHeader
104+
# define inflateInit z_inflateInit
105+
# define inflateInit2 z_inflateInit2
101106
# define inflateInit2_ z_inflateInit2_
102107
# define inflateInit_ z_inflateInit_
103108
# define inflateMark z_inflateMark

‎zlib.h‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1761,19 +1761,35 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
17611761
unsigned char FAR *window,
17621762
const char *version,
17631763
int stream_size));
1764-
#define deflateInit(strm, level) \
1765-
deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
1766-
#define inflateInit(strm) \
1767-
inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
1768-
#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
1769-
deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
1770-
(strategy), ZLIB_VERSION, (int)sizeof(z_stream))
1771-
#define inflateInit2(strm, windowBits) \
1772-
inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
1773-
(int)sizeof(z_stream))
1774-
#define inflateBackInit(strm, windowBits, window) \
1775-
inflateBackInit_((strm), (windowBits), (window), \
1776-
ZLIB_VERSION, (int)sizeof(z_stream))
1764+
#ifdef Z_PREFIX_SET
1765+
# define z_deflateInit(strm, level) \
1766+
deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
1767+
# define z_inflateInit(strm) \
1768+
inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
1769+
# define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
1770+
deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
1771+
(strategy), ZLIB_VERSION, (int)sizeof(z_stream))
1772+
# define z_inflateInit2(strm, windowBits) \
1773+
inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
1774+
(int)sizeof(z_stream))
1775+
# define z_inflateBackInit(strm, windowBits, window) \
1776+
inflateBackInit_((strm), (windowBits), (window), \
1777+
ZLIB_VERSION, (int)sizeof(z_stream))
1778+
#else
1779+
# define deflateInit(strm, level) \
1780+
deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
1781+
# define inflateInit(strm) \
1782+
inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
1783+
# define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
1784+
deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
1785+
(strategy), ZLIB_VERSION, (int)sizeof(z_stream))
1786+
# define inflateInit2(strm, windowBits) \
1787+
inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
1788+
(int)sizeof(z_stream))
1789+
# define inflateBackInit(strm, windowBits, window) \
1790+
inflateBackInit_((strm), (windowBits), (window), \
1791+
ZLIB_VERSION, (int)sizeof(z_stream))
1792+
#endif
17771793

17781794
#ifndef Z_SOLO
17791795

0 commit comments

Comments
 (0)