diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2022-04-05 21:27:03 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2022-04-05 21:27:03 +0000 |
commit | 37e731f0bd81249f8b43bada12adaa611b7a595b (patch) | |
tree | 99e477a2cd57a94782ae182b8c5e2c0024751356 /Build/source/libs/freetype2/freetype-src/src/gzip/patches | |
parent | 7c200a413ce80d2d09a0dda338e9407bba0d3855 (diff) |
freetype2 : revert
git-svn-id: svn://tug.org/texlive/trunk@62919 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/gzip/patches')
-rw-r--r-- | Build/source/libs/freetype2/freetype-src/src/gzip/patches/freetype-zlib.diff | 396 |
1 files changed, 0 insertions, 396 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/gzip/patches/freetype-zlib.diff b/Build/source/libs/freetype2/freetype-src/src/gzip/patches/freetype-zlib.diff deleted file mode 100644 index 90dd6c863f0..00000000000 --- a/Build/source/libs/freetype2/freetype-src/src/gzip/patches/freetype-zlib.diff +++ /dev/null @@ -1,396 +0,0 @@ -[zlib] Fix zlib sources for compilation with FreeType - -We must ensure that they do not issue compiler errors or warnings when they -are compiled as part of `src/gzip/ftgzip.c`. - -* src/gzip/adler32.c: Do not define unused functions when `Z_FREETYPE` -is set. - -* src/gzip/crc32.c (DO1, DO8): Undefine. Already defined in `adler32.c`. - -* src/gzip/gzguts.h (COPY): Rename to... -(COPY__): ... this since `COPY` and `COPY_` conflict with enum values, -which have the same name in `zlib.h`. - -* src/gzip/inflate.c, src/gzip/adler32.c: Omit unused function -declarations when `Z_FREETYPE` is defined. - -* src/gzip/zlib.h: Include `ftzconf.h` instead of `zconf.h` to avoid -conflicts with system-installed headers. -Omit unused function declarations when `Z_FREETYPE` is defined. - -* src/gzip/zutil.h: Use `ft_memxxx` functions instead of `memxxx`. -Omit unused function declarations when `Z_FREETYPE` is defined. - -* src/gzip/inflate.h, src/gzip/inftrees.h: Add header guard macros to -prevent compiler errors. - -diff --git b/src/gzip/adler32.c a/src/gzip/adler32.c -index be5e8a247..aa032e1dd 100644 ---- b/src/gzip/adler32.c -+++ a/src/gzip/adler32.c -@@ -7,7 +7,9 @@ - - #include "zutil.h" - -+#ifndef Z_FREETYPE - local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); -+#endif - - #define BASE 65521U /* largest prime smaller than 65536 */ - #define NMAX 5552 -@@ -139,6 +141,8 @@ uLong ZEXPORT adler32( - return adler32_z(adler, buf, len); - } - -+#ifndef Z_FREETYPE -+ - /* ========================================================================= */ - local uLong adler32_combine_( - uLong adler1, -@@ -184,3 +188,5 @@ uLong ZEXPORT adler32_combine64( - { - return adler32_combine_(adler1, adler2, len2); - } -+ -+#endif /* !Z_FREETYPE */ -diff --git b/src/gzip/crc32.c a/src/gzip/crc32.c -index 3e3eb1794..ffced1ea7 100644 ---- b/src/gzip/crc32.c -+++ a/src/gzip/crc32.c -@@ -195,6 +195,8 @@ const z_crc_t FAR * ZEXPORT get_crc_table() - } - - /* ========================================================================= */ -+#undef DO1 -+#undef DO8 - #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8) - #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 - -diff --git b/src/gzip/gzguts.h a/src/gzip/gzguts.h -index 990a4d251..c81f8f392 100644 ---- b/src/gzip/gzguts.h -+++ a/src/gzip/gzguts.h -@@ -163,7 +163,7 @@ - - /* values for gz_state how */ - #define LOOK 0 /* look for a gzip header */ --#define COPY 1 /* copy input directly */ -+#define COPY__ 1 /* copy input directly */ - #define GZIP 2 /* decompress a gzip stream */ - - /* internal gzip file state data structure */ -diff --git b/src/gzip/inflate.c a/src/gzip/inflate.c -index 3f7ea647b..7387e6f57 100644 ---- b/src/gzip/inflate.c -+++ a/src/gzip/inflate.c -@@ -99,8 +99,10 @@ local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, - #ifdef BUILDFIXED - void makefixed OF((void)); - #endif -+#ifndef Z_FREETYPE - local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf, - unsigned len)); -+#endif - - local int inflateStateCheck( - z_streamp strm) -@@ -244,6 +246,8 @@ int ZEXPORT inflateInit_( - return inflateInit2_(strm, DEF_WBITS, version, stream_size); - } - -+#ifndef Z_FREETYPE -+ - int ZEXPORT inflatePrime( - z_streamp strm, - int bits, -@@ -265,6 +269,8 @@ int ZEXPORT inflatePrime( - return Z_OK; - } - -+#endif /* Z_FREETYPE */ -+ - /* - Return state with length and distance decoding tables and index sizes set to - fixed code decoding. Normally this returns fixed tables from inffixed.h. -@@ -1288,6 +1294,8 @@ int ZEXPORT inflateEnd( - return Z_OK; - } - -+#ifndef Z_FREETYPE -+ - int ZEXPORT inflateGetDictionary( - z_streamp strm, - Bytef *dictionary, -@@ -1440,6 +1448,8 @@ int ZEXPORT inflateSync( - return Z_OK; - } - -+#endif /* !Z_FREETYPE */ -+ - /* - 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 -@@ -1458,6 +1468,8 @@ int ZEXPORT inflateSyncPoint( - return state->mode == STORED && state->bits == 0; - } - -+#if !Z_FREETYPE -+ - int ZEXPORT inflateCopy( - z_streamp dest, - z_streamp source) -@@ -1505,6 +1517,8 @@ int ZEXPORT inflateCopy( - return Z_OK; - } - -+#endif /* !Z_FREETYPE */ -+ - int ZEXPORT inflateUndermine( - z_streamp strm, - int subvert) -@@ -1538,6 +1552,8 @@ int ZEXPORT inflateValidate( - return Z_OK; - } - -+#ifndef Z_FREETYPE -+ - long ZEXPORT inflateMark( - z_streamp strm) - { -@@ -1559,3 +1575,5 @@ unsigned long ZEXPORT inflateCodesUsed( - state = (struct inflate_state FAR *)strm->state; - return (unsigned long)(state->next - state->codes); - } -+ -+#endif /* !Z_FREETYPE */ -diff --git b/src/gzip/inflate.h a/src/gzip/inflate.h -index a46cce6b6..92ea758e2 100644 ---- b/src/gzip/inflate.h -+++ a/src/gzip/inflate.h -@@ -3,6 +3,9 @@ - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -+#ifndef INFLATE_H -+#define INFLATE_H -+ - /* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. -@@ -123,3 +126,5 @@ struct inflate_state { - int back; /* bits back of last unprocessed length/lit */ - unsigned was; /* initial length of match */ - }; -+ -+#endif /* INFLATE_H */ -diff --git b/src/gzip/inftrees.h a/src/gzip/inftrees.h -index baa53a0b1..c94eb78b5 100644 ---- b/src/gzip/inftrees.h -+++ a/src/gzip/inftrees.h -@@ -3,6 +3,9 @@ - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -+#ifndef INFTREES_H -+#define INFTREES_H -+ - /* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. -@@ -60,3 +63,5 @@ typedef enum { - int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens, - unsigned codes, code FAR * FAR *table, - unsigned FAR *bits, unsigned short FAR *work)); -+ -+#endif /* INFTREES_H_ */ -diff --git b/src/gzip/zlib.h a/src/gzip/zlib.h -index f09cdaf1e..1807c0645 100644 ---- b/src/gzip/zlib.h -+++ a/src/gzip/zlib.h -@@ -31,7 +31,7 @@ - #ifndef ZLIB_H - #define ZLIB_H - --#include "zconf.h" -+#include "ftzconf.h" - - #ifdef __cplusplus - extern "C" { -@@ -211,6 +211,8 @@ typedef gz_header FAR *gz_headerp; - - #define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ - -+#ifndef Z_FREETYPE -+ - #define zlib_version zlibVersion() - /* for compatibility with versions < 1.0.2 */ - -@@ -246,7 +248,6 @@ ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); - this will be done by deflate(). - */ - -- - ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); - /* - deflate compresses as much data as possible, and stops when the input -@@ -373,6 +374,7 @@ ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); - deallocated). - */ - -+#endif /* !Z_FREETYPE */ - - /* - ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); -@@ -534,6 +536,8 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); - The following functions are needed only in some special applications. - */ - -+#ifndef Z_FREETYPE -+ - /* - ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, - int level, -@@ -954,6 +958,8 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, - destination. - */ - -+#endif /* !Z_FREETYPE */ -+ - ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); - /* - This function is equivalent to inflateEnd followed by inflateInit, -@@ -978,6 +984,8 @@ ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, - the windowBits parameter is invalid. - */ - -+#ifndef Z_FREETYPE -+ - ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, - int bits, - int value)); -@@ -1067,6 +1075,8 @@ ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, - stream state was inconsistent. - */ - -+#endif /* !Z_FREETYPE */ -+ - /* - ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, - unsigned char FAR *window)); -@@ -1093,6 +1103,8 @@ typedef unsigned (*in_func) OF((void FAR *, - z_const unsigned char FAR * FAR *)); - typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); - -+#ifndef Z_FREETYPE -+ - ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, - in_func in, void FAR *in_desc, - out_func out, void FAR *out_desc)); -@@ -1212,6 +1224,8 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); - 27-31: 0 (reserved) - */ - -+#endif /* !Z_FREETYPE */ -+ - #ifndef Z_SOLO - - /* utility functions */ -@@ -1739,6 +1753,8 @@ ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); - if (crc != original_crc) error(); - */ - -+#ifndef Z_FREETYPE -+ - ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf, - z_size_t len)); - /* -@@ -1805,6 +1821,19 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, - ZLIB_VERSION, (int)sizeof(z_stream)) - #endif - -+#else /* Z_FREETYPE */ -+ -+ -+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, -+ const char *version, int stream_size)); -+ -+# define inflateInit2(strm, windowBits) \ -+ inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ -+ (int)sizeof(z_stream)) -+ -+#endif /* Z_FREETYPE */ -+ -+ - #ifndef Z_SOLO - - /* gzgetc() macro and its supporting function and exposed data structure. Note -@@ -1879,12 +1908,15 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ - - #else /* Z_SOLO */ - -+#ifndef Z_FREETYPE - ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); - ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); -+#endif - - #endif /* !Z_SOLO */ - - /* undocumented functions */ -+#ifndef Z_FREETYPE - ZEXTERN const char * ZEXPORT zError OF((int)); - ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); - ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void)); -@@ -1904,6 +1936,7 @@ ZEXTERN int ZEXPORTVA gzvprintf Z_ARG((gzFile file, - va_list va)); - # endif - #endif -+#endif /* !Z_FREETYPE */ - - #ifdef __cplusplus - } -diff --git b/src/gzip/zutil.h a/src/gzip/zutil.h -index b079ea6a8..2d734a835 100644 ---- b/src/gzip/zutil.h -+++ a/src/gzip/zutil.h -@@ -30,7 +30,9 @@ - #endif - - #ifdef Z_SOLO -+# ifndef Z_FREETYPE - typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */ -+# endif - #endif - - #ifndef local -@@ -185,6 +187,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ - #pragma warn -8066 - #endif - -+#ifndef Z_FREETYPE -+ - /* provide prototypes for these when building zlib without LFS */ - #if !defined(_WIN32) && \ - (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) -@@ -192,6 +196,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)); - #endif - -+#endif /* !Z_FREETYPE */ -+ - /* common defaults */ - - #ifndef OS_CODE -@@ -223,9 +229,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 --# define zmemcpy memcpy --# define zmemcmp memcmp --# define zmemzero(dest, len) memset(dest, 0, len) -+# define zmemcpy ft_memcpy -+# define zmemcmp ft_memcmp -+# define zmemzero(dest, len) ft_memset(dest, 0, len) - # endif - #else - void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); |