diff options
Diffstat (limited to 'src/gzip/patches/freetype-zlib.diff')
| -rw-r--r-- | src/gzip/patches/freetype-zlib.diff | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/gzip/patches/freetype-zlib.diff b/src/gzip/patches/freetype-zlib.diff index 20d84293f..42eea1928 100644 --- a/src/gzip/patches/freetype-zlib.diff +++ b/src/gzip/patches/freetype-zlib.diff @@ -66,7 +66,7 @@ index 57faf3716..4f09a52a7 100644 /* internal gzip file state data structure */ diff --git a/src/gzip/inflate.c b/src/gzip/inflate.c -index 4375557b4..5bf5b815e 100644 +index c9e566b03..33c7cf2fe 100644 --- a/src/gzip/inflate.c +++ b/src/gzip/inflate.c @@ -99,8 +99,10 @@ local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, @@ -80,7 +80,7 @@ index 4375557b4..5bf5b815e 100644 local int inflateStateCheck( z_streamp strm) -@@ -245,6 +247,8 @@ int ZEXPORT inflateInit_( +@@ -247,6 +249,8 @@ int ZEXPORT inflateInit_( return inflateInit2_(strm, DEF_WBITS, version, stream_size); } @@ -89,7 +89,7 @@ index 4375557b4..5bf5b815e 100644 int ZEXPORT inflatePrime( z_streamp strm, int bits, -@@ -266,6 +270,8 @@ int ZEXPORT inflatePrime( +@@ -268,6 +272,8 @@ int ZEXPORT inflatePrime( return Z_OK; } @@ -98,7 +98,7 @@ index 4375557b4..5bf5b815e 100644 /* Return state with length and distance decoding tables and index sizes set to fixed code decoding. Normally this returns fixed tables from inffixed.h. -@@ -1312,6 +1318,8 @@ int ZEXPORT inflateEnd( +@@ -1315,6 +1321,8 @@ int ZEXPORT inflateEnd( return Z_OK; } @@ -107,7 +107,7 @@ index 4375557b4..5bf5b815e 100644 int ZEXPORT inflateGetDictionary( z_streamp strm, Bytef *dictionary, -@@ -1471,6 +1479,8 @@ int ZEXPORT inflateSync( +@@ -1474,6 +1482,8 @@ int ZEXPORT inflateSync( return Z_OK; } @@ -116,7 +116,7 @@ index 4375557b4..5bf5b815e 100644 /* Returns true if inflate is currently at the end of a block generated by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP -@@ -1489,6 +1499,8 @@ int ZEXPORT inflateSyncPoint( +@@ -1492,6 +1502,8 @@ int ZEXPORT inflateSyncPoint( return state->mode == STORED && state->bits == 0; } @@ -125,7 +125,7 @@ index 4375557b4..5bf5b815e 100644 int ZEXPORT inflateCopy( z_streamp dest, z_streamp source) -@@ -1536,6 +1548,8 @@ int ZEXPORT inflateCopy( +@@ -1539,6 +1551,8 @@ int ZEXPORT inflateCopy( return Z_OK; } @@ -134,7 +134,7 @@ index 4375557b4..5bf5b815e 100644 int ZEXPORT inflateUndermine( z_streamp strm, int subvert) -@@ -1569,6 +1583,8 @@ int ZEXPORT inflateValidate( +@@ -1572,6 +1586,8 @@ int ZEXPORT inflateValidate( return Z_OK; } @@ -143,7 +143,7 @@ index 4375557b4..5bf5b815e 100644 long ZEXPORT inflateMark( z_streamp strm) { -@@ -1590,3 +1606,5 @@ unsigned long ZEXPORT inflateCodesUsed( +@@ -1593,3 +1609,5 @@ unsigned long ZEXPORT inflateCodesUsed( state = (struct inflate_state FAR *)strm->state; return (unsigned long)(state->next - state->codes); } @@ -170,7 +170,7 @@ index f127b6b1f..c6f5a52e1 100644 + +#endif /* INFLATE_H */ diff --git a/src/gzip/inftrees.h b/src/gzip/inftrees.h -index baa53a0b1..c94eb78b5 100644 +index f53665311..2daa00063 100644 --- a/src/gzip/inftrees.h +++ b/src/gzip/inftrees.h @@ -3,6 +3,9 @@ @@ -190,7 +190,7 @@ index baa53a0b1..c94eb78b5 100644 + +#endif /* INFTREES_H_ */ diff --git a/src/gzip/zlib.h b/src/gzip/zlib.h -index 4a98e38bf..d760140c2 100644 +index 953cb5012..bbbf75151 100644 --- a/src/gzip/zlib.h +++ b/src/gzip/zlib.h @@ -31,7 +31,7 @@ @@ -336,7 +336,7 @@ index 4a98e38bf..d760140c2 100644 #ifdef __cplusplus } diff --git a/src/gzip/zutil.h b/src/gzip/zutil.h -index d9a20ae1b..14f0f1a85 100644 +index 0bc7f4ecd..d309bd069 100644 --- a/src/gzip/zutil.h +++ b/src/gzip/zutil.h @@ -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 /* provide prototypes for these when building zlib without LFS */ #if !defined(_WIN32) && \ (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) -@@ -195,6 +197,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); +@@ -196,6 +198,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ + ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t)); #endif +#endif /* !Z_FREETYPE */ @@ -357,7 +357,7 @@ index d9a20ae1b..14f0f1a85 100644 /* common defaults */ #ifndef OS_CODE -@@ -226,9 +230,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ +@@ -227,9 +231,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define zmemcmp _fmemcmp # define zmemzero(dest, len) _fmemset(dest, 0, len) # else |