diff options
Diffstat (limited to 'src/3rdparty/freetype/src/gzip/zutil.c')
| -rw-r--r-- | src/3rdparty/freetype/src/gzip/zutil.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/3rdparty/freetype/src/gzip/zutil.c b/src/3rdparty/freetype/src/gzip/zutil.c index a19ac2b96d..542706ca0c 100644 --- a/src/3rdparty/freetype/src/gzip/zutil.c +++ b/src/3rdparty/freetype/src/gzip/zutil.c @@ -10,6 +10,8 @@ # include "gzguts.h" #endif +#ifndef Z_FREETYPE + 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 */ @@ -61,9 +63,11 @@ uLong ZEXPORT zlibCompileFlags() #ifdef ZLIB_DEBUG flags += 1 << 8; #endif + /* #if defined(ASMV) || defined(ASMINF) flags += 1 << 9; #endif + */ #ifdef ZLIB_WINAPI flags += 1 << 10; #endif @@ -119,7 +123,7 @@ uLong ZEXPORT zlibCompileFlags() # endif int ZLIB_INTERNAL z_verbose = verbose; -void ZLIB_INTERNAL z_error ( +void ZLIB_INTERNAL z_error( char *m) { fprintf(stderr, "%s\n", m); @@ -136,6 +140,8 @@ const char * ZEXPORT zError( return ERR_MSG(err); } +#endif /* !Z_FREETYPE */ + #if defined(_WIN32_WCE) && _WIN32_WCE < 0x800 /* The older Microsoft C Run-Time Library for Windows CE doesn't have * errno. We define it as a global variable to simplify porting. @@ -157,6 +163,8 @@ void ZLIB_INTERNAL zmemcpy( } while (--len != 0); } +#ifndef Z_FREETYPE + int ZLIB_INTERNAL zmemcmp( const Bytef* s1, const Bytef* s2, @@ -179,6 +187,7 @@ void ZLIB_INTERNAL zmemzero( *dest++ = 0; /* ??? to be unrolled */ } while (--len != 0); } +#endif /* !Z_FREETYPE */ #endif #ifndef Z_SOLO @@ -214,7 +223,7 @@ local ptr_table table[MAX_PTR]; * a protected system like OS/2. Use Microsoft C instead. */ -voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) +voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) { voidpf buf; ulg bsize = (ulg)items*size; @@ -240,7 +249,7 @@ voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) return buf; } -void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) +void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) { int n; @@ -277,13 +286,13 @@ void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) # define _hfree hfree #endif -voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) +voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size) { (void)opaque; return _halloc((long)items, size); } -void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) +void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr) { (void)opaque; _hfree(ptr); @@ -302,7 +311,7 @@ extern voidp calloc OF((uInt items, uInt size)); extern void free OF((voidpf ptr)); #endif -voidpf ZLIB_INTERNAL zcalloc ( +voidpf ZLIB_INTERNAL zcalloc( voidpf opaque, unsigned items, unsigned size) @@ -312,7 +321,7 @@ voidpf ZLIB_INTERNAL zcalloc ( (voidpf)calloc(items, size); } -void ZLIB_INTERNAL zcfree ( +void ZLIB_INTERNAL zcfree( voidpf opaque, voidpf ptr) { |