aboutsummaryrefslogtreecommitdiff
path: root/zconf.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--zconf.h16
-rw-r--r--zconf.h.cmakein16
-rw-r--r--zconf.h.in16
3 files changed, 36 insertions, 12 deletions
diff --git a/zconf.h b/zconf.h
index ca1eb81..5e1d68a 100644
--- a/zconf.h
+++ b/zconf.h
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2013 Jean-loup Gailly. 2 * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -29,6 +29,7 @@
29# define adler32 z_adler32 29# define adler32 z_adler32
30# define adler32_combine z_adler32_combine 30# define adler32_combine z_adler32_combine
31# define adler32_combine64 z_adler32_combine64 31# define adler32_combine64 z_adler32_combine64
32# define adler32_z z_adler32_z
32# ifndef Z_SOLO 33# ifndef Z_SOLO
33# define compress z_compress 34# define compress z_compress
34# define compress2 z_compress2 35# define compress2 z_compress2
@@ -37,10 +38,12 @@
37# define crc32 z_crc32 38# define crc32 z_crc32
38# define crc32_combine z_crc32_combine 39# define crc32_combine z_crc32_combine
39# define crc32_combine64 z_crc32_combine64 40# define crc32_combine64 z_crc32_combine64
41# define crc32_z z_crc32_z
40# define deflate z_deflate 42# define deflate z_deflate
41# define deflateBound z_deflateBound 43# define deflateBound z_deflateBound
42# define deflateCopy z_deflateCopy 44# define deflateCopy z_deflateCopy
43# define deflateEnd z_deflateEnd 45# define deflateEnd z_deflateEnd
46# define deflateGetDictionary z_deflateGetDictionary
44# define deflateInit z_deflateInit 47# define deflateInit z_deflateInit
45# define deflateInit2 z_deflateInit2 48# define deflateInit2 z_deflateInit2
46# define deflateInit2_ z_deflateInit2_ 49# define deflateInit2_ z_deflateInit2_
@@ -69,6 +72,8 @@
69# define gzeof z_gzeof 72# define gzeof z_gzeof
70# define gzerror z_gzerror 73# define gzerror z_gzerror
71# define gzflush z_gzflush 74# define gzflush z_gzflush
75# define gzfread z_gzfread
76# define gzfwrite z_gzfwrite
72# define gzgetc z_gzgetc 77# define gzgetc z_gzgetc
73# define gzgetc_ z_gzgetc_ 78# define gzgetc_ z_gzgetc_
74# define gzgets z_gzgets 79# define gzgets z_gzgets
@@ -80,7 +85,6 @@
80# define gzopen_w z_gzopen_w 85# define gzopen_w z_gzopen_w
81# endif 86# endif
82# define gzprintf z_gzprintf 87# define gzprintf z_gzprintf
83# define gzvprintf z_gzvprintf
84# define gzputc z_gzputc 88# define gzputc z_gzputc
85# define gzputs z_gzputs 89# define gzputs z_gzputs
86# define gzread z_gzread 90# define gzread z_gzread
@@ -91,6 +95,7 @@
91# define gztell z_gztell 95# define gztell z_gztell
92# define gztell64 z_gztell64 96# define gztell64 z_gztell64
93# define gzungetc z_gzungetc 97# define gzungetc z_gzungetc
98# define gzvprintf z_gzvprintf
94# define gzwrite z_gzwrite 99# define gzwrite z_gzwrite
95# endif 100# endif
96# define inflate z_inflate 101# define inflate z_inflate
@@ -98,8 +103,10 @@
98# define inflateBackEnd z_inflateBackEnd 103# define inflateBackEnd z_inflateBackEnd
99# define inflateBackInit z_inflateBackInit 104# define inflateBackInit z_inflateBackInit
100# define inflateBackInit_ z_inflateBackInit_ 105# define inflateBackInit_ z_inflateBackInit_
106# define inflateCodesUsed z_inflateCodesUsed
101# define inflateCopy z_inflateCopy 107# define inflateCopy z_inflateCopy
102# define inflateEnd z_inflateEnd 108# define inflateEnd z_inflateEnd
109# define inflateGetDictionary z_inflateGetDictionary
103# define inflateGetHeader z_inflateGetHeader 110# define inflateGetHeader z_inflateGetHeader
104# define inflateInit z_inflateInit 111# define inflateInit z_inflateInit
105# define inflateInit2 z_inflateInit2 112# define inflateInit2 z_inflateInit2
@@ -109,17 +116,18 @@
109# define inflatePrime z_inflatePrime 116# define inflatePrime z_inflatePrime
110# define inflateReset z_inflateReset 117# define inflateReset z_inflateReset
111# define inflateReset2 z_inflateReset2 118# define inflateReset2 z_inflateReset2
119# define inflateResetKeep z_inflateResetKeep
112# define inflateSetDictionary z_inflateSetDictionary 120# define inflateSetDictionary z_inflateSetDictionary
113# define inflateGetDictionary z_inflateGetDictionary
114# define inflateSync z_inflateSync 121# define inflateSync z_inflateSync
115# define inflateSyncPoint z_inflateSyncPoint 122# define inflateSyncPoint z_inflateSyncPoint
116# define inflateUndermine z_inflateUndermine 123# define inflateUndermine z_inflateUndermine
117# define inflateResetKeep z_inflateResetKeep 124# define inflateValidate z_inflateValidate
118# define inflate_copyright z_inflate_copyright 125# define inflate_copyright z_inflate_copyright
119# define inflate_fast z_inflate_fast 126# define inflate_fast z_inflate_fast
120# define inflate_table z_inflate_table 127# define inflate_table z_inflate_table
121# ifndef Z_SOLO 128# ifndef Z_SOLO
122# define uncompress z_uncompress 129# define uncompress z_uncompress
130# define uncompress2 z_uncompress2
123# endif 131# endif
124# define zError z_zError 132# define zError z_zError
125# ifndef Z_SOLO 133# ifndef Z_SOLO
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 27a220b..a7f24cc 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2013 Jean-loup Gailly. 2 * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -31,6 +31,7 @@
31# define adler32 z_adler32 31# define adler32 z_adler32
32# define adler32_combine z_adler32_combine 32# define adler32_combine z_adler32_combine
33# define adler32_combine64 z_adler32_combine64 33# define adler32_combine64 z_adler32_combine64
34# define adler32_z z_adler32_z
34# ifndef Z_SOLO 35# ifndef Z_SOLO
35# define compress z_compress 36# define compress z_compress
36# define compress2 z_compress2 37# define compress2 z_compress2
@@ -39,10 +40,12 @@
39# define crc32 z_crc32 40# define crc32 z_crc32
40# define crc32_combine z_crc32_combine 41# define crc32_combine z_crc32_combine
41# define crc32_combine64 z_crc32_combine64 42# define crc32_combine64 z_crc32_combine64
43# define crc32_z z_crc32_z
42# define deflate z_deflate 44# define deflate z_deflate
43# define deflateBound z_deflateBound 45# define deflateBound z_deflateBound
44# define deflateCopy z_deflateCopy 46# define deflateCopy z_deflateCopy
45# define deflateEnd z_deflateEnd 47# define deflateEnd z_deflateEnd
48# define deflateGetDictionary z_deflateGetDictionary
46# define deflateInit z_deflateInit 49# define deflateInit z_deflateInit
47# define deflateInit2 z_deflateInit2 50# define deflateInit2 z_deflateInit2
48# define deflateInit2_ z_deflateInit2_ 51# define deflateInit2_ z_deflateInit2_
@@ -71,6 +74,8 @@
71# define gzeof z_gzeof 74# define gzeof z_gzeof
72# define gzerror z_gzerror 75# define gzerror z_gzerror
73# define gzflush z_gzflush 76# define gzflush z_gzflush
77# define gzfread z_gzfread
78# define gzfwrite z_gzfwrite
74# define gzgetc z_gzgetc 79# define gzgetc z_gzgetc
75# define gzgetc_ z_gzgetc_ 80# define gzgetc_ z_gzgetc_
76# define gzgets z_gzgets 81# define gzgets z_gzgets
@@ -82,7 +87,6 @@
82# define gzopen_w z_gzopen_w 87# define gzopen_w z_gzopen_w
83# endif 88# endif
84# define gzprintf z_gzprintf 89# define gzprintf z_gzprintf
85# define gzvprintf z_gzvprintf
86# define gzputc z_gzputc 90# define gzputc z_gzputc
87# define gzputs z_gzputs 91# define gzputs z_gzputs
88# define gzread z_gzread 92# define gzread z_gzread
@@ -93,6 +97,7 @@
93# define gztell z_gztell 97# define gztell z_gztell
94# define gztell64 z_gztell64 98# define gztell64 z_gztell64
95# define gzungetc z_gzungetc 99# define gzungetc z_gzungetc
100# define gzvprintf z_gzvprintf
96# define gzwrite z_gzwrite 101# define gzwrite z_gzwrite
97# endif 102# endif
98# define inflate z_inflate 103# define inflate z_inflate
@@ -100,8 +105,10 @@
100# define inflateBackEnd z_inflateBackEnd 105# define inflateBackEnd z_inflateBackEnd
101# define inflateBackInit z_inflateBackInit 106# define inflateBackInit z_inflateBackInit
102# define inflateBackInit_ z_inflateBackInit_ 107# define inflateBackInit_ z_inflateBackInit_
108# define inflateCodesUsed z_inflateCodesUsed
103# define inflateCopy z_inflateCopy 109# define inflateCopy z_inflateCopy
104# define inflateEnd z_inflateEnd 110# define inflateEnd z_inflateEnd
111# define inflateGetDictionary z_inflateGetDictionary
105# define inflateGetHeader z_inflateGetHeader 112# define inflateGetHeader z_inflateGetHeader
106# define inflateInit z_inflateInit 113# define inflateInit z_inflateInit
107# define inflateInit2 z_inflateInit2 114# define inflateInit2 z_inflateInit2
@@ -111,17 +118,18 @@
111# define inflatePrime z_inflatePrime 118# define inflatePrime z_inflatePrime
112# define inflateReset z_inflateReset 119# define inflateReset z_inflateReset
113# define inflateReset2 z_inflateReset2 120# define inflateReset2 z_inflateReset2
121# define inflateResetKeep z_inflateResetKeep
114# define inflateSetDictionary z_inflateSetDictionary 122# define inflateSetDictionary z_inflateSetDictionary
115# define inflateGetDictionary z_inflateGetDictionary
116# define inflateSync z_inflateSync 123# define inflateSync z_inflateSync
117# define inflateSyncPoint z_inflateSyncPoint 124# define inflateSyncPoint z_inflateSyncPoint
118# define inflateUndermine z_inflateUndermine 125# define inflateUndermine z_inflateUndermine
119# define inflateResetKeep z_inflateResetKeep 126# define inflateValidate z_inflateValidate
120# define inflate_copyright z_inflate_copyright 127# define inflate_copyright z_inflate_copyright
121# define inflate_fast z_inflate_fast 128# define inflate_fast z_inflate_fast
122# define inflate_table z_inflate_table 129# define inflate_table z_inflate_table
123# ifndef Z_SOLO 130# ifndef Z_SOLO
124# define uncompress z_uncompress 131# define uncompress z_uncompress
132# define uncompress2 z_uncompress2
125# endif 133# endif
126# define zError z_zError 134# define zError z_zError
127# ifndef Z_SOLO 135# ifndef Z_SOLO
diff --git a/zconf.h.in b/zconf.h.in
index ca1eb81..5e1d68a 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2013 Jean-loup Gailly. 2 * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -29,6 +29,7 @@
29# define adler32 z_adler32 29# define adler32 z_adler32
30# define adler32_combine z_adler32_combine 30# define adler32_combine z_adler32_combine
31# define adler32_combine64 z_adler32_combine64 31# define adler32_combine64 z_adler32_combine64
32# define adler32_z z_adler32_z
32# ifndef Z_SOLO 33# ifndef Z_SOLO
33# define compress z_compress 34# define compress z_compress
34# define compress2 z_compress2 35# define compress2 z_compress2
@@ -37,10 +38,12 @@
37# define crc32 z_crc32 38# define crc32 z_crc32
38# define crc32_combine z_crc32_combine 39# define crc32_combine z_crc32_combine
39# define crc32_combine64 z_crc32_combine64 40# define crc32_combine64 z_crc32_combine64
41# define crc32_z z_crc32_z
40# define deflate z_deflate 42# define deflate z_deflate
41# define deflateBound z_deflateBound 43# define deflateBound z_deflateBound
42# define deflateCopy z_deflateCopy 44# define deflateCopy z_deflateCopy
43# define deflateEnd z_deflateEnd 45# define deflateEnd z_deflateEnd
46# define deflateGetDictionary z_deflateGetDictionary
44# define deflateInit z_deflateInit 47# define deflateInit z_deflateInit
45# define deflateInit2 z_deflateInit2 48# define deflateInit2 z_deflateInit2
46# define deflateInit2_ z_deflateInit2_ 49# define deflateInit2_ z_deflateInit2_
@@ -69,6 +72,8 @@
69# define gzeof z_gzeof 72# define gzeof z_gzeof
70# define gzerror z_gzerror 73# define gzerror z_gzerror
71# define gzflush z_gzflush 74# define gzflush z_gzflush
75# define gzfread z_gzfread
76# define gzfwrite z_gzfwrite
72# define gzgetc z_gzgetc 77# define gzgetc z_gzgetc
73# define gzgetc_ z_gzgetc_ 78# define gzgetc_ z_gzgetc_
74# define gzgets z_gzgets 79# define gzgets z_gzgets
@@ -80,7 +85,6 @@
80# define gzopen_w z_gzopen_w 85# define gzopen_w z_gzopen_w
81# endif 86# endif
82# define gzprintf z_gzprintf 87# define gzprintf z_gzprintf
83# define gzvprintf z_gzvprintf
84# define gzputc z_gzputc 88# define gzputc z_gzputc
85# define gzputs z_gzputs 89# define gzputs z_gzputs
86# define gzread z_gzread 90# define gzread z_gzread
@@ -91,6 +95,7 @@
91# define gztell z_gztell 95# define gztell z_gztell
92# define gztell64 z_gztell64 96# define gztell64 z_gztell64
93# define gzungetc z_gzungetc 97# define gzungetc z_gzungetc
98# define gzvprintf z_gzvprintf
94# define gzwrite z_gzwrite 99# define gzwrite z_gzwrite
95# endif 100# endif
96# define inflate z_inflate 101# define inflate z_inflate
@@ -98,8 +103,10 @@
98# define inflateBackEnd z_inflateBackEnd 103# define inflateBackEnd z_inflateBackEnd
99# define inflateBackInit z_inflateBackInit 104# define inflateBackInit z_inflateBackInit
100# define inflateBackInit_ z_inflateBackInit_ 105# define inflateBackInit_ z_inflateBackInit_
106# define inflateCodesUsed z_inflateCodesUsed
101# define inflateCopy z_inflateCopy 107# define inflateCopy z_inflateCopy
102# define inflateEnd z_inflateEnd 108# define inflateEnd z_inflateEnd
109# define inflateGetDictionary z_inflateGetDictionary
103# define inflateGetHeader z_inflateGetHeader 110# define inflateGetHeader z_inflateGetHeader
104# define inflateInit z_inflateInit 111# define inflateInit z_inflateInit
105# define inflateInit2 z_inflateInit2 112# define inflateInit2 z_inflateInit2
@@ -109,17 +116,18 @@
109# define inflatePrime z_inflatePrime 116# define inflatePrime z_inflatePrime
110# define inflateReset z_inflateReset 117# define inflateReset z_inflateReset
111# define inflateReset2 z_inflateReset2 118# define inflateReset2 z_inflateReset2
119# define inflateResetKeep z_inflateResetKeep
112# define inflateSetDictionary z_inflateSetDictionary 120# define inflateSetDictionary z_inflateSetDictionary
113# define inflateGetDictionary z_inflateGetDictionary
114# define inflateSync z_inflateSync 121# define inflateSync z_inflateSync
115# define inflateSyncPoint z_inflateSyncPoint 122# define inflateSyncPoint z_inflateSyncPoint
116# define inflateUndermine z_inflateUndermine 123# define inflateUndermine z_inflateUndermine
117# define inflateResetKeep z_inflateResetKeep 124# define inflateValidate z_inflateValidate
118# define inflate_copyright z_inflate_copyright 125# define inflate_copyright z_inflate_copyright
119# define inflate_fast z_inflate_fast 126# define inflate_fast z_inflate_fast
120# define inflate_table z_inflate_table 127# define inflate_table z_inflate_table
121# ifndef Z_SOLO 128# ifndef Z_SOLO
122# define uncompress z_uncompress 129# define uncompress z_uncompress
130# define uncompress2 z_uncompress2
123# endif 131# endif
124# define zError z_zError 132# define zError z_zError
125# ifndef Z_SOLO 133# ifndef Z_SOLO