mirror of
https://github.com/blupi-games/planetblupi-dev
synced 2024-12-30 13:55:36 +01:00
Rename more symbols
This commit is contained in:
parent
3dbcd2af11
commit
5510848ea5
84
externals/patches/SDL2_ttf-2.20.1.patch
vendored
84
externals/patches/SDL2_ttf-2.20.1.patch
vendored
@ -456,3 +456,87 @@ index 14f0f1a..c7c4bf9 100644
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* !Z_FREETYPE */
|
#endif /* !Z_FREETYPE */
|
||||||
|
diff --git a/external/freetype/src/gzip/ftzconf.h b/external/freetype/src/gzip/ftzconf.h
|
||||||
|
index 5e1d68a..43d2fed 100644
|
||||||
|
--- a/external/freetype/src/gzip/ftzconf.h
|
||||||
|
+++ b/external/freetype/src/gzip/ftzconf.h
|
||||||
|
@@ -129,13 +129,13 @@
|
||||||
|
# define uncompress z_uncompress
|
||||||
|
# define uncompress2 z_uncompress2
|
||||||
|
# endif
|
||||||
|
-# define zError z_zError
|
||||||
|
+# define zError _z_zError
|
||||||
|
# ifndef Z_SOLO
|
||||||
|
-# define zcalloc z_zcalloc
|
||||||
|
-# define zcfree z_zcfree
|
||||||
|
+# define zcalloc _z_zcalloc
|
||||||
|
+# define zcfree _z_zcfree
|
||||||
|
# endif
|
||||||
|
-# define zlibCompileFlags z_zlibCompileFlags
|
||||||
|
-# define zlibVersion z_zlibVersion
|
||||||
|
+# define zlibCompileFlags _z_zlibCompileFlags
|
||||||
|
+# define zlibVersion _z_zlibVersion
|
||||||
|
|
||||||
|
/* all zlib typedefs in zlib.h and zconf.h */
|
||||||
|
# define Byte z_Byte
|
||||||
|
diff --git a/external/freetype/src/gzip/patches/freetype-zlib.diff b/external/freetype/src/gzip/patches/freetype-zlib.diff
|
||||||
|
index 20d8429..1be478c 100644
|
||||||
|
--- a/external/freetype/src/gzip/patches/freetype-zlib.diff
|
||||||
|
+++ b/external/freetype/src/gzip/patches/freetype-zlib.diff
|
||||||
|
@@ -339,7 +339,7 @@ diff --git a/src/gzip/zutil.h b/src/gzip/zutil.h
|
||||||
|
index d9a20ae1b..14f0f1a85 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 */
|
||||||
|
+@@ -188,6 +188,8 @@ extern z_const char * const _z_errmsg[10]; /* indexed by 2-zlib_error */
|
||||||
|
#pragma warn -8066
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -348,7 +348,7 @@ 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 */
|
||||||
|
+@@ -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));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -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 */
|
||||||
|
+@@ -226,9 +230,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
|
||||||
|
diff --git a/external/freetype/src/gzip/zutil.c b/external/freetype/src/gzip/zutil.c
|
||||||
|
index a19ac2b..3d5004b 100644
|
||||||
|
--- a/external/freetype/src/gzip/zutil.c
|
||||||
|
+++ b/external/freetype/src/gzip/zutil.c
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
# include "gzguts.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-z_const char * const z_errmsg[10] = {
|
||||||
|
+z_const char * const _z_errmsg[10] = {
|
||||||
|
(z_const char *)"need dictionary", /* Z_NEED_DICT 2 */
|
||||||
|
(z_const char *)"stream end", /* Z_STREAM_END 1 */
|
||||||
|
(z_const char *)"", /* Z_OK 0 */
|
||||||
|
diff --git a/external/freetype/src/gzip/zutil.h b/external/freetype/src/gzip/zutil.h
|
||||||
|
index 14f0f1a..6a354c4 100644
|
||||||
|
--- a/external/freetype/src/gzip/zutil.h
|
||||||
|
+++ b/external/freetype/src/gzip/zutil.h
|
||||||
|
@@ -53,10 +53,10 @@ typedef unsigned long ulg;
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
||||||
|
+extern z_const char * const _z_errmsg[10]; /* indexed by 2-zlib_error */
|
||||||
|
/* (size given to avoid silly warnings with Visual C++) */
|
||||||
|
|
||||||
|
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
|
||||||
|
+#define ERR_MSG(err) _z_errmsg[Z_NEED_DICT-(err)]
|
||||||
|
|
||||||
|
#define ERR_RETURN(strm,err) \
|
||||||
|
return (strm->msg = ERR_MSG(err), (err))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user