aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--zconf.h7
-rw-r--r--zconf.h.cmakein7
-rw-r--r--zconf.h.in7
-rw-r--r--zlib.h42
4 files changed, 47 insertions, 16 deletions
diff --git a/zconf.h b/zconf.h
index ca12b79..aee94b0 100644
--- a/zconf.h
+++ b/zconf.h
@@ -17,7 +17,7 @@
17#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ 17#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
18# define Z_PREFIX_SET 18# define Z_PREFIX_SET
19 19
20/* all linked symbols */ 20/* all linked symbols and init macros */
21# define _dist_code z__dist_code 21# define _dist_code z__dist_code
22# define _length_code z__length_code 22# define _length_code z__length_code
23# define _tr_align z__tr_align 23# define _tr_align z__tr_align
@@ -41,6 +41,8 @@
41# define deflateBound z_deflateBound 41# define deflateBound z_deflateBound
42# define deflateCopy z_deflateCopy 42# define deflateCopy z_deflateCopy
43# define deflateEnd z_deflateEnd 43# define deflateEnd z_deflateEnd
44# define deflateInit z_deflateInit
45# define deflateInit2 z_deflateInit2
44# define deflateInit2_ z_deflateInit2_ 46# define deflateInit2_ z_deflateInit2_
45# define deflateInit_ z_deflateInit_ 47# define deflateInit_ z_deflateInit_
46# define deflateParams z_deflateParams 48# define deflateParams z_deflateParams
@@ -94,10 +96,13 @@
94# define inflate z_inflate 96# define inflate z_inflate
95# define inflateBack z_inflateBack 97# define inflateBack z_inflateBack
96# define inflateBackEnd z_inflateBackEnd 98# define inflateBackEnd z_inflateBackEnd
99# define inflateBackInit z_inflateBackInit
97# define inflateBackInit_ z_inflateBackInit_ 100# define inflateBackInit_ z_inflateBackInit_
98# define inflateCopy z_inflateCopy 101# define inflateCopy z_inflateCopy
99# define inflateEnd z_inflateEnd 102# define inflateEnd z_inflateEnd
100# define inflateGetHeader z_inflateGetHeader 103# define inflateGetHeader z_inflateGetHeader
104# define inflateInit z_inflateInit
105# define inflateInit2 z_inflateInit2
101# define inflateInit2_ z_inflateInit2_ 106# define inflateInit2_ z_inflateInit2_
102# define inflateInit_ z_inflateInit_ 107# define inflateInit_ z_inflateInit_
103# define inflateMark z_inflateMark 108# define inflateMark z_inflateMark
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index efd91f7..fe97071 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -19,7 +19,7 @@
19#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ 19#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
20# define Z_PREFIX_SET 20# define Z_PREFIX_SET
21 21
22/* all linked symbols */ 22/* all linked symbols and init macros */
23# define _dist_code z__dist_code 23# define _dist_code z__dist_code
24# define _length_code z__length_code 24# define _length_code z__length_code
25# define _tr_align z__tr_align 25# define _tr_align z__tr_align
@@ -43,6 +43,8 @@
43# define deflateBound z_deflateBound 43# define deflateBound z_deflateBound
44# define deflateCopy z_deflateCopy 44# define deflateCopy z_deflateCopy
45# define deflateEnd z_deflateEnd 45# define deflateEnd z_deflateEnd
46# define deflateInit z_deflateInit
47# define deflateInit2 z_deflateInit2
46# define deflateInit2_ z_deflateInit2_ 48# define deflateInit2_ z_deflateInit2_
47# define deflateInit_ z_deflateInit_ 49# define deflateInit_ z_deflateInit_
48# define deflateParams z_deflateParams 50# define deflateParams z_deflateParams
@@ -96,10 +98,13 @@
96# define inflate z_inflate 98# define inflate z_inflate
97# define inflateBack z_inflateBack 99# define inflateBack z_inflateBack
98# define inflateBackEnd z_inflateBackEnd 100# define inflateBackEnd z_inflateBackEnd
101# define inflateBackInit z_inflateBackInit
99# define inflateBackInit_ z_inflateBackInit_ 102# define inflateBackInit_ z_inflateBackInit_
100# define inflateCopy z_inflateCopy 103# define inflateCopy z_inflateCopy
101# define inflateEnd z_inflateEnd 104# define inflateEnd z_inflateEnd
102# define inflateGetHeader z_inflateGetHeader 105# define inflateGetHeader z_inflateGetHeader
106# define inflateInit z_inflateInit
107# define inflateInit2 z_inflateInit2
103# define inflateInit2_ z_inflateInit2_ 108# define inflateInit2_ z_inflateInit2_
104# define inflateInit_ z_inflateInit_ 109# define inflateInit_ z_inflateInit_
105# define inflateMark z_inflateMark 110# define inflateMark z_inflateMark
diff --git a/zconf.h.in b/zconf.h.in
index ca12b79..aee94b0 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -17,7 +17,7 @@
17#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ 17#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
18# define Z_PREFIX_SET 18# define Z_PREFIX_SET
19 19
20/* all linked symbols */ 20/* all linked symbols and init macros */
21# define _dist_code z__dist_code 21# define _dist_code z__dist_code
22# define _length_code z__length_code 22# define _length_code z__length_code
23# define _tr_align z__tr_align 23# define _tr_align z__tr_align
@@ -41,6 +41,8 @@
41# define deflateBound z_deflateBound 41# define deflateBound z_deflateBound
42# define deflateCopy z_deflateCopy 42# define deflateCopy z_deflateCopy
43# define deflateEnd z_deflateEnd 43# define deflateEnd z_deflateEnd
44# define deflateInit z_deflateInit
45# define deflateInit2 z_deflateInit2
44# define deflateInit2_ z_deflateInit2_ 46# define deflateInit2_ z_deflateInit2_
45# define deflateInit_ z_deflateInit_ 47# define deflateInit_ z_deflateInit_
46# define deflateParams z_deflateParams 48# define deflateParams z_deflateParams
@@ -94,10 +96,13 @@
94# define inflate z_inflate 96# define inflate z_inflate
95# define inflateBack z_inflateBack 97# define inflateBack z_inflateBack
96# define inflateBackEnd z_inflateBackEnd 98# define inflateBackEnd z_inflateBackEnd
99# define inflateBackInit z_inflateBackInit
97# define inflateBackInit_ z_inflateBackInit_ 100# define inflateBackInit_ z_inflateBackInit_
98# define inflateCopy z_inflateCopy 101# define inflateCopy z_inflateCopy
99# define inflateEnd z_inflateEnd 102# define inflateEnd z_inflateEnd
100# define inflateGetHeader z_inflateGetHeader 103# define inflateGetHeader z_inflateGetHeader
104# define inflateInit z_inflateInit
105# define inflateInit2 z_inflateInit2
101# define inflateInit2_ z_inflateInit2_ 106# define inflateInit2_ z_inflateInit2_
102# define inflateInit_ z_inflateInit_ 107# define inflateInit_ z_inflateInit_
103# define inflateMark z_inflateMark 108# define inflateMark z_inflateMark
diff --git a/zlib.h b/zlib.h
index 6f4a049..d831cd7 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1761,19 +1761,35 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
1761 unsigned char FAR *window, 1761 unsigned char FAR *window,
1762 const char *version, 1762 const char *version,
1763 int stream_size)); 1763 int stream_size));
1764#define deflateInit(strm, level) \ 1764#ifdef Z_PREFIX_SET
1765 deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) 1765# define z_deflateInit(strm, level) \
1766#define inflateInit(strm) \ 1766 deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
1767 inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) 1767# define z_inflateInit(strm) \
1768#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ 1768 inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
1769 deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ 1769# define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
1770 (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) 1770 deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
1771#define inflateInit2(strm, windowBits) \ 1771 (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
1772 inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ 1772# define z_inflateInit2(strm, windowBits) \
1773 (int)sizeof(z_stream)) 1773 inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
1774#define inflateBackInit(strm, windowBits, window) \ 1774 (int)sizeof(z_stream))
1775 inflateBackInit_((strm), (windowBits), (window), \ 1775# define z_inflateBackInit(strm, windowBits, window) \
1776 ZLIB_VERSION, (int)sizeof(z_stream)) 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
1777 1793
1778#ifndef Z_SOLO 1794#ifndef Z_SOLO
1779 1795