[Git][freetype/freetype][master] [gzip] Update sources to zlib 1.2.13.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• af46fcc1
  by Werner Lemberg at 2022-10-18T19:43:52+02:00

  [gzip] Update sources to zlib 1.2.13.
  

9 changed files:

• src/gzip/crc32.c
• src/gzip/infback.c
• src/gzip/inflate.c
• src/gzip/inftrees.c
• src/gzip/inftrees.h
• src/gzip/patches/freetype-zlib.diff
• src/gzip/zlib.h
• src/gzip/zutil.c
• src/gzip/zutil.h

Changes:

src/gzip/crc32.c

---

...	...	@@ -98,13 +98,22 @@
98	98	# endif
99	99	#endif
100	100
	101	+/* If available, use the ARM processor CRC32 instruction. */
	102	+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
	103	+# define ARMCRC32
	104	+#endif
	105	+
101	106	/* Local functions. */
102	107	local z_crc_t multmodp OF((z_crc_t a, z_crc_t b));
103	108	local z_crc_t x2nmodp OF((z_off64_t n, unsigned k));
104	109
105		-/* If available, use the ARM processor CRC32 instruction. */
106		-#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
107		-# define ARMCRC32
	110	+#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
	111	+ local z_word_t byte_swap OF((z_word_t word));
	112	+#endif
	113	+
	114	+#if defined(W) && !defined(ARMCRC32)
	115	+ local z_crc_t crc_word OF((z_word_t data));
	116	+ local z_word_t crc_word_big OF((z_word_t data));
108	117	#endif
109	118
110	119	#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
...	...	@@ -630,7 +639,7 @@ unsigned long ZEXPORT crc32_z(
630	639	#endif /* DYNAMIC_CRC_TABLE */
631	640
632	641	/* Pre-condition the CRC */
633		- crc ^= 0xffffffff;
	642	+ crc = (~crc) & 0xffffffff;
634	643
635	644	/* Compute the CRC up to a word boundary. */
636	645	while (len && ((z_size_t)buf & 7) != 0) {
...	...	@@ -645,8 +654,8 @@ unsigned long ZEXPORT crc32_z(
645	654	len &= 7;
646	655
647	656	/* Do three interleaved CRCs to realize the throughput of one crc32x
648		- instruction per cycle. Each CRC is calcuated on Z_BATCH words. The three
649		- CRCs are combined into a single CRC after each set of batches. */
	657	+ instruction per cycle. Each CRC is calculated on Z_BATCH words. The
	658	+ three CRCs are combined into a single CRC after each set of batches. */
650	659	while (num >= 3 * Z_BATCH) {
651	660	crc1 = 0;
652	661	crc2 = 0;
...	...	@@ -749,7 +758,7 @@ unsigned long ZEXPORT crc32_z(
749	758	#endif /* DYNAMIC_CRC_TABLE */
750	759
751	760	/* Pre-condition the CRC */
752		- crc ^= 0xffffffff;
	761	+ crc = (~crc) & 0xffffffff;
753	762
754	763	#ifdef W
755	764
...	...	@@ -1077,7 +1086,7 @@ uLong ZEXPORT crc32_combine64(
1077	1086	#ifdef DYNAMIC_CRC_TABLE
1078	1087	once(&made, make_crc_table);
1079	1088	#endif /* DYNAMIC_CRC_TABLE */
1080		- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
	1089	+ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
1081	1090	}
1082	1091
1083	1092	/* ========================================================================= */
...	...	@@ -1086,7 +1095,7 @@ uLong ZEXPORT crc32_combine(
1086	1095	uLong crc2,
1087	1096	z_off_t len2)
1088	1097	{
1089		- return crc32_combine64(crc1, crc2, len2);
	1098	+ return crc32_combine64(crc1, crc2, (z_off64_t)len2);
1090	1099	}
1091	1100
1092	1101	/* ========================================================================= */
...	...	@@ -1103,14 +1112,14 @@ uLong ZEXPORT crc32_combine_gen64(
1103	1112	uLong ZEXPORT crc32_combine_gen(
1104	1113	z_off_t len2)
1105	1114	{
1106		- return crc32_combine_gen64(len2);
	1115	+ return crc32_combine_gen64((z_off64_t)len2);
1107	1116	}
1108	1117
1109	1118	/* ========================================================================= */
1110		-uLong crc32_combine_op(
	1119	+uLong ZEXPORT crc32_combine_op(
1111	1120	uLong crc1,
1112	1121	uLong crc2,
1113	1122	uLong op)
1114	1123	{
1115		- return multmodp(op, crc1) ^ crc2;
	1124	+ return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
1116	1125	}

src/gzip/infback.c

---

...	...	@@ -66,6 +66,7 @@ int ZEXPORT inflateBackInit_(
66	66	state->window = window;
67	67	state->wnext = 0;
68	68	state->whave = 0;
	69	+ state->sane = 1;
69	70	return Z_OK;
70	71	}
71	72
...	...	@@ -605,25 +606,27 @@ int ZEXPORT inflateBack(
605	606	break;
606	607
607	608	case DONE:
608		- /* inflate stream terminated properly -- write leftover output */
	609	+ /* inflate stream terminated properly */
609	610	ret = Z_STREAM_END;
610		- if (left < state->wsize) {
611		- if (out(out_desc, state->window, state->wsize - left))
612		- ret = Z_BUF_ERROR;
613		- }
614	611	goto inf_leave;
615	612
616	613	case BAD:
617	614	ret = Z_DATA_ERROR;
618	615	goto inf_leave;
619	616
620		- default: /* can't happen, but makes compilers happy */
	617	+ default:
	618	+ /* can't happen, but makes compilers happy */
621	619	ret = Z_STREAM_ERROR;
622	620	goto inf_leave;
623	621	}
624	622
625		- /* Return unused input */
	623	+ /* Write leftover output and return unused input */
626	624	inf_leave:
	625	+ if (left < state->wsize) {
	626	+ if (out(out_desc, state->window, state->wsize - left) &&
	627	+ ret == Z_STREAM_END)
	628	+ ret = Z_BUF_ERROR;
	629	+ }
627	630	strm->next_in = next;
628	631	strm->avail_in = have;
629	632	return ret;

src/gzip/inflate.c

---

...	...	@@ -170,6 +170,8 @@ int ZEXPORT inflateReset2(
170	170
171	171	/* extract wrap request from windowBits parameter */
172	172	if (windowBits < 0) {
	173	+ if (windowBits < -15)
	174	+ return Z_STREAM_ERROR;
173	175	wrap = 0;
174	176	windowBits = -windowBits;
175	177	}
...	...	@@ -770,8 +772,9 @@ int ZEXPORT inflate(
770	772	if (copy > have) copy = have;
771	773	if (copy) {
772	774	if (state->head != Z_NULL &&
773		- state->head->extra != Z_NULL) {
774		- len = state->head->extra_len - state->length;
	775	+ state->head->extra != Z_NULL &&
	776	+ (len = state->head->extra_len - state->length) <
	777	+ state->head->extra_max) {
775	778	zmemcpy(state->head->extra + len, next,
776	779	len + copy > state->head->extra_max ?
777	780	state->head->extra_max - len : copy);

src/gzip/inftrees.c

---

...	...	@@ -9,7 +9,7 @@
9	9	#define MAXBITS 15
10	10
11	11	const char inflate_copyright[] =
12		- " inflate 1.2.12 Copyright 1995-2022 Mark Adler ";
	12	+ " inflate 1.2.13 Copyright 1995-2022 Mark Adler ";
13	13	/*
14	14	If you use the zlib library in a product, an acknowledgment is welcome
15	15	in the documentation of your product. If for some reason you cannot
...	...	@@ -62,7 +62,7 @@ int ZLIB_INTERNAL inflate_table(
62	62	35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
63	63	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
64	64	16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
65		- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 199, 202};
	65	+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 194, 65};
66	66	static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
67	67	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
68	68	257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,

src/gzip/inftrees.h

---

...	...	@@ -41,7 +41,7 @@ typedef struct {
41	41	/* Maximum size of the dynamic table. The maximum number of code structures is
42	42	1444, which is the sum of 852 for literal/length codes and 592 for distance
43	43	codes. These values were found by exhaustive searches using the program
44		- examples/enough.c found in the zlib distribtution. The arguments to that
	44	+ examples/enough.c found in the zlib distribution. The arguments to that
45	45	program are the number of symbols, the initial root table size, and the
46	46	maximum bit length of a code. "enough 286 9 15" for literal/length codes
47	47	returns returns 852, and "enough 30 6 15" for distance codes returns 592.

src/gzip/patches/freetype-zlib.diff

---

...	...	@@ -66,7 +66,7 @@ index 57faf3716..4f09a52a7 100644
66	66
67	67	/* internal gzip file state data structure */
68	68	diff --git a/src/gzip/inflate.c b/src/gzip/inflate.c
69		-index 4375557b4..5bf5b815e 100644
	69	+index c9e566b03..33c7cf2fe 100644
70	70	--- a/src/gzip/inflate.c
71	71	+++ b/src/gzip/inflate.c
72	72	@@ -99,8 +99,10 @@ local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
...	...	@@ -80,7 +80,7 @@ index 4375557b4..5bf5b815e 100644
80	80
81	81	local int inflateStateCheck(
82	82	z_streamp strm)
83		-@@ -245,6 +247,8 @@ int ZEXPORT inflateInit_(
	83	+@@ -247,6 +249,8 @@ int ZEXPORT inflateInit_(
84	84	return inflateInit2_(strm, DEF_WBITS, version, stream_size);
85	85	}
86	86
...	...	@@ -89,7 +89,7 @@ index 4375557b4..5bf5b815e 100644
89	89	int ZEXPORT inflatePrime(
90	90	z_streamp strm,
91	91	int bits,
92		-@@ -266,6 +270,8 @@ int ZEXPORT inflatePrime(
	92	+@@ -268,6 +272,8 @@ int ZEXPORT inflatePrime(
93	93	return Z_OK;
94	94	}
95	95
...	...	@@ -98,7 +98,7 @@ index 4375557b4..5bf5b815e 100644
98	98	/*
99	99	Return state with length and distance decoding tables and index sizes set to
100	100	fixed code decoding. Normally this returns fixed tables from inffixed.h.
101		-@@ -1312,6 +1318,8 @@ int ZEXPORT inflateEnd(
	101	+@@ -1315,6 +1321,8 @@ int ZEXPORT inflateEnd(
102	102	return Z_OK;
103	103	}
104	104
...	...	@@ -107,7 +107,7 @@ index 4375557b4..5bf5b815e 100644
107	107	int ZEXPORT inflateGetDictionary(
108	108	z_streamp strm,
109	109	Bytef *dictionary,
110		-@@ -1471,6 +1479,8 @@ int ZEXPORT inflateSync(
	110	+@@ -1474,6 +1482,8 @@ int ZEXPORT inflateSync(
111	111	return Z_OK;
112	112	}
113	113
...	...	@@ -116,7 +116,7 @@ index 4375557b4..5bf5b815e 100644
116	116	/*
117	117	Returns true if inflate is currently at the end of a block generated by
118	118	Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
119		-@@ -1489,6 +1499,8 @@ int ZEXPORT inflateSyncPoint(
	119	+@@ -1492,6 +1502,8 @@ int ZEXPORT inflateSyncPoint(
120	120	return state->mode == STORED && state->bits == 0;
121	121	}
122	122
...	...	@@ -125,7 +125,7 @@ index 4375557b4..5bf5b815e 100644
125	125	int ZEXPORT inflateCopy(
126	126	z_streamp dest,
127	127	z_streamp source)
128		-@@ -1536,6 +1548,8 @@ int ZEXPORT inflateCopy(
	128	+@@ -1539,6 +1551,8 @@ int ZEXPORT inflateCopy(
129	129	return Z_OK;
130	130	}
131	131
...	...	@@ -134,7 +134,7 @@ index 4375557b4..5bf5b815e 100644
134	134	int ZEXPORT inflateUndermine(
135	135	z_streamp strm,
136	136	int subvert)
137		-@@ -1569,6 +1583,8 @@ int ZEXPORT inflateValidate(
	137	+@@ -1572,6 +1586,8 @@ int ZEXPORT inflateValidate(
138	138	return Z_OK;
139	139	}
140	140
...	...	@@ -143,7 +143,7 @@ index 4375557b4..5bf5b815e 100644
143	143	long ZEXPORT inflateMark(
144	144	z_streamp strm)
145	145	{
146		-@@ -1590,3 +1606,5 @@ unsigned long ZEXPORT inflateCodesUsed(
	146	+@@ -1593,3 +1609,5 @@ unsigned long ZEXPORT inflateCodesUsed(
147	147	state = (struct inflate_state FAR *)strm->state;
148	148	return (unsigned long)(state->next - state->codes);
149	149	}
...	...	@@ -170,7 +170,7 @@ index f127b6b1f..c6f5a52e1 100644
170	170	+
171	171	+#endif /* INFLATE_H */
172	172	diff --git a/src/gzip/inftrees.h b/src/gzip/inftrees.h
173		-index baa53a0b1..c94eb78b5 100644
	173	+index f53665311..2daa00063 100644
174	174	--- a/src/gzip/inftrees.h
175	175	+++ b/src/gzip/inftrees.h
176	176	@@ -3,6 +3,9 @@
...	...	@@ -190,7 +190,7 @@ index baa53a0b1..c94eb78b5 100644
190	190	+
191	191	+#endif /* INFTREES_H_ */
192	192	diff --git a/src/gzip/zlib.h b/src/gzip/zlib.h
193		-index 4a98e38bf..d760140c2 100644
	193	+index 953cb5012..bbbf75151 100644
194	194	--- a/src/gzip/zlib.h
195	195	+++ b/src/gzip/zlib.h
196	196	@@ -31,7 +31,7 @@
...	...	@@ -336,7 +336,7 @@ index 4a98e38bf..d760140c2 100644
336	336	#ifdef __cplusplus
337	337	}
338	338	diff --git a/src/gzip/zutil.h b/src/gzip/zutil.h
339		-index d9a20ae1b..14f0f1a85 100644
	339	+index 0bc7f4ecd..d309bd069 100644
340	340	--- a/src/gzip/zutil.h
341	341	+++ b/src/gzip/zutil.h
342	342	@@ -188,6 +188,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
...	...	@@ -348,8 +348,8 @@ index d9a20ae1b..14f0f1a85 100644
348	348	/* provide prototypes for these when building zlib without LFS */
349	349	#if !defined(_WIN32) && \
350	350	(!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
351		-@@ -195,6 +197,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
352		- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
	351	+@@ -196,6 +198,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
	352	+ ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
353	353	#endif
354	354
355	355	+#endif /* !Z_FREETYPE */
...	...	@@ -357,7 +357,7 @@ index d9a20ae1b..14f0f1a85 100644
357	357	/* common defaults */
358	358
359	359	#ifndef OS_CODE
360		-@@ -226,9 +230,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
	360	+@@ -227,9 +231,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
361	361	# define zmemcmp _fmemcmp
362	362	# define zmemzero(dest, len) _fmemset(dest, 0, len)
363	363	# else

src/gzip/zlib.h

---

1	1	/* zlib.h -- interface of the 'zlib' general purpose compression library
2		- version 1.2.12, March 11th, 2022
	2	+ version 1.2.13, October 13th, 2022
3	3
4	4	Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
5	5
...	...	@@ -37,11 +37,11 @@
37	37	extern "C" {
38	38	#endif
39	39
40		-#define ZLIB_VERSION "1.2.12"
41		-#define ZLIB_VERNUM 0x12c0
	40	+#define ZLIB_VERSION "1.2.13"
	41	+#define ZLIB_VERNUM 0x12d0
42	42	#define ZLIB_VER_MAJOR 1
43	43	#define ZLIB_VER_MINOR 2
44		-#define ZLIB_VER_REVISION 12
	44	+#define ZLIB_VER_REVISION 13
45	45	#define ZLIB_VER_SUBREVISION 0
46	46
47	47	/*
...	...	@@ -277,7 +277,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
277	277	== 0), or after each call of deflate(). If deflate returns Z_OK and with
278	278	zero avail_out, it must be called again after making room in the output
279	279	buffer because there might be more output pending. See deflatePending(),
280		- which can be used if desired to determine whether or not there is more ouput
	280	+ which can be used if desired to determine whether or not there is more output
281	281	in that case.
282	282
283	283	Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
...	...	@@ -664,7 +664,7 @@ ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
664	664	to dictionary. dictionary must have enough space, where 32768 bytes is
665	665	always enough. If deflateGetDictionary() is called with dictionary equal to
666	666	Z_NULL, then only the dictionary length is returned, and nothing is copied.
667		- Similary, if dictLength is Z_NULL, then it is not set.
	667	+ Similarly, if dictLength is Z_NULL, then it is not set.
668	668
669	669	deflateGetDictionary() may return a length less than the window size, even
670	670	when more than the window size in input has been provided. It may return up
...	...	@@ -919,7 +919,7 @@ ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
919	919	to dictionary. dictionary must have enough space, where 32768 bytes is
920	920	always enough. If inflateGetDictionary() is called with dictionary equal to
921	921	Z_NULL, then only the dictionary length is returned, and nothing is copied.
922		- Similary, if dictLength is Z_NULL, then it is not set.
	922	+ Similarly, if dictLength is Z_NULL, then it is not set.
923	923
924	924	inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
925	925	stream state is inconsistent.
...	...	@@ -1451,12 +1451,12 @@ ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
1451	1451
1452	1452	In the event that the end of file is reached and only a partial item is
1453	1453	available at the end, i.e. the remaining uncompressed data length is not a
1454		- multiple of size, then the final partial item is nevetheless read into buf
	1454	+ multiple of size, then the final partial item is nevertheless read into buf
1455	1455	and the end-of-file flag is set. The length of the partial item read is not
1456	1456	provided, but could be inferred from the result of gztell(). This behavior
1457	1457	is the same as the behavior of fread() implementations in common libraries,
1458	1458	but it prevents the direct use of gzfread() to read a concurrently written
1459		- file, reseting and retrying on end-of-file, when size is not 1.
	1459	+ file, resetting and retrying on end-of-file, when size is not 1.
1460	1460	*/
1461	1461
1462	1462	ZEXTERN int ZEXPORT gzwrite OF((gzFile file, voidpc buf, unsigned len));
...	...	@@ -1945,7 +1945,7 @@ ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp));
1945	1945	ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void));
1946	1946	ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int));
1947	1947	ZEXTERN int ZEXPORT inflateValidate OF((z_streamp, int));
1948		-ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp));
	1948	+ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF((z_streamp));
1949	1949	ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp));
1950	1950	ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp));
1951	1951	#if defined(_WIN32) && !defined(Z_SOLO)

src/gzip/zutil.c

---

...	...	@@ -61,9 +61,11 @@ uLong ZEXPORT zlibCompileFlags()
61	61	#ifdef ZLIB_DEBUG
62	62	flags += 1 << 8;
63	63	#endif
	64	+ /*
64	65	#if defined(ASMV) || defined(ASMINF)
65	66	flags += 1 << 9;
66	67	#endif
	68	+ */
67	69	#ifdef ZLIB_WINAPI
68	70	flags += 1 << 10;
69	71	#endif
...	...	@@ -119,7 +121,7 @@ uLong ZEXPORT zlibCompileFlags()
119	121	# endif
120	122	int ZLIB_INTERNAL z_verbose = verbose;
121	123
122		-void ZLIB_INTERNAL z_error (
	124	+void ZLIB_INTERNAL z_error(
123	125	char *m)
124	126	{
125	127	fprintf(stderr, "%s\n", m);
...	...	@@ -214,7 +216,7 @@ local ptr_table table[MAX_PTR];
214	216	* a protected system like OS/2. Use Microsoft C instead.
215	217	*/
216	218
217		-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
	219	+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
218	220	{
219	221	voidpf buf;
220	222	ulg bsize = (ulg)items*size;
...	...	@@ -240,7 +242,7 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
240	242	return buf;
241	243	}
242	244
243		-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
	245	+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
244	246	{
245	247	int n;
246	248
...	...	@@ -277,13 +279,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
277	279	# define _hfree hfree
278	280	#endif
279	281
280		-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
	282	+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size)
281	283	{
282	284	(void)opaque;
283	285	return _halloc((long)items, size);
284	286	}
285	287
286		-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
	288	+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
287	289	{
288	290	(void)opaque;
289	291	_hfree(ptr);
...	...	@@ -302,7 +304,7 @@ extern voidp calloc OF((uInt items, uInt size));
302	304	extern void free OF((voidpf ptr));
303	305	#endif
304	306
305		-voidpf ZLIB_INTERNAL zcalloc (
	307	+voidpf ZLIB_INTERNAL zcalloc(
306	308	voidpf opaque,
307	309	unsigned items,
308	310	unsigned size)
...	...	@@ -312,7 +314,7 @@ voidpf ZLIB_INTERNAL zcalloc (
312	314	(voidpf)calloc(items, size);
313	315	}
314	316
315		-void ZLIB_INTERNAL zcfree (
	317	+void ZLIB_INTERNAL zcfree(
316	318	voidpf opaque,
317	319	voidpf ptr)
318	320	{

src/gzip/zutil.h

---

...	...	@@ -195,6 +195,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
195	195	(!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
196	196	ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
197	197	ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
	198	+ ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
198	199	#endif
199	200
200	201	#endif /* !Z_FREETYPE */

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help