!26 remove unapplied patch
From: @zhoupengcheng11 Reviewed-by: @lvying6 Signed-off-by: @lvying6
This commit is contained in:
commit
3839aca4cd
@ -1,41 +0,0 @@
|
|||||||
diff --git a/deflate.c b/deflate.c
|
|
||||||
index 1ec7614..b724c8d 100644
|
|
||||||
--- a/deflate.c
|
|
||||||
+++ b/deflate.c
|
|
||||||
@@ -1233,15 +1233,16 @@ local void lm_init (s)
|
|
||||||
/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
|
|
||||||
* match.S. The code will be functionally equivalent.
|
|
||||||
*/
|
|
||||||
-local uInt longest_match(s, cur_match)
|
|
||||||
+local uInt longest_match(s, pcur_match)
|
|
||||||
deflate_state *s;
|
|
||||||
- IPos cur_match; /* current match */
|
|
||||||
+ IPos pcur_match; /* current match */
|
|
||||||
{
|
|
||||||
+ ptrdiff_t cur_match = pcur_match; /* extend to pointer width */
|
|
||||||
unsigned chain_length = s->max_chain_length;/* max hash chain length */
|
|
||||||
register Bytef *scan = s->window + s->strstart; /* current string */
|
|
||||||
register Bytef *match; /* matched string */
|
|
||||||
register int len; /* length of current match */
|
|
||||||
- int best_len = (int)s->prev_length; /* best match length so far */
|
|
||||||
+ ptrdiff_t best_len = s->prev_length; /* best match length so far */
|
|
||||||
int nice_match = s->nice_match; /* stop if match long enough */
|
|
||||||
IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
|
|
||||||
s->strstart - (IPos)MAX_DIST(s) : NIL;
|
|
||||||
@@ -1256,12 +1257,12 @@ local uInt longest_match(s, cur_match)
|
|
||||||
* Try with and without -DUNALIGNED_OK to check.
|
|
||||||
*/
|
|
||||||
register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
|
|
||||||
- register ush scan_start = *(ushf*)scan;
|
|
||||||
- register ush scan_end = *(ushf*)(scan+best_len-1);
|
|
||||||
+ register uInt scan_start = *(ushf*)scan;
|
|
||||||
+ register uInt scan_end = *(ushf*)(scan+best_len-1);
|
|
||||||
#else
|
|
||||||
register Bytef *strend = s->window + s->strstart + MAX_MATCH;
|
|
||||||
- register Byte scan_end1 = scan[best_len-1];
|
|
||||||
- register Byte scan_end = scan[best_len];
|
|
||||||
+ register uInt scan_end1 = scan[best_len-1];
|
|
||||||
+ register uInt scan_end = scan[best_len];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: zlib
|
Name: zlib
|
||||||
Version: 1.2.11
|
Version: 1.2.11
|
||||||
Release: 23
|
Release: 24
|
||||||
Summary: A lossless data-compression library
|
Summary: A lossless data-compression library
|
||||||
License: zlib and Boost
|
License: zlib and Boost
|
||||||
URL: http://www.zlib.net
|
URL: http://www.zlib.net
|
||||||
@ -135,6 +135,9 @@ make test
|
|||||||
%{_libdir}/pkgconfig/minizip.pc
|
%{_libdir}/pkgconfig/minizip.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 26 2022 zhoupengcheng <zhoupengcheng11@huawei.com> - 1.2.11-24
|
||||||
|
- DESC:remove unapplied patches
|
||||||
|
|
||||||
* Tue Aug 23 2022 shixuantong <shixuantong@h-partners.com> - 1.2.11-23
|
* Tue Aug 23 2022 shixuantong <shixuantong@h-partners.com> - 1.2.11-23
|
||||||
- Fix missing patches due to different arch
|
- Fix missing patches due to different arch
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user