From 3b2fb7f27e8f0893313a9fd011eaeea85c9db37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20K=C3=B6ppe?= Date: Wed, 3 Aug 2016 15:50:54 +0100 Subject: [PATCH] [unzip.c{,pp}] Change zc{alloc,free} to internal linkage --- libs/pak/unzip.cpp | 4 ++-- plugins/vfspk3/unzip.cpp | 4 ++-- plugins/vfsqlpk3/unzip.cpp | 4 ++-- tools/quake3/common/unzip.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/pak/unzip.cpp b/libs/pak/unzip.cpp index 269c76c3..8bf2e6a4 100644 --- a/libs/pak/unzip.cpp +++ b/libs/pak/unzip.cpp @@ -1158,8 +1158,8 @@ int z_verbose = 0; typedef uLong ( *check_func ) OF ( ( uLong check, const Byte * buf, uInt len ) ); -voidp zcalloc OF( ( voidp opaque, unsigned items, unsigned size ) ); -void zcfree OF( ( voidp opaque, voidp ptr ) ); +static voidp zcalloc OF( ( voidp opaque, unsigned items, unsigned size ) ); +static void zcfree OF( ( voidp opaque, voidp ptr ) ); #define ZALLOC( strm, items, size ) \ ( *( ( strm )->zalloc ) )( ( strm )->opaque, ( items ), ( size ) ) diff --git a/plugins/vfspk3/unzip.cpp b/plugins/vfspk3/unzip.cpp index 7390894a..1ef15059 100644 --- a/plugins/vfspk3/unzip.cpp +++ b/plugins/vfspk3/unzip.cpp @@ -1177,8 +1177,8 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ typedef uLong (*check_func) OF((uLong check, const Byte *buf, uInt len)); -voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); -void zcfree OF((voidp opaque, voidp ptr)); +static voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); +static void zcfree OF((voidp opaque, voidp ptr)); #define ZALLOC(strm, items, size) \ (*((strm)->zalloc))((strm)->opaque, (items), (size)) diff --git a/plugins/vfsqlpk3/unzip.cpp b/plugins/vfsqlpk3/unzip.cpp index c7ff36b7..cc1f13d5 100644 --- a/plugins/vfsqlpk3/unzip.cpp +++ b/plugins/vfsqlpk3/unzip.cpp @@ -1178,8 +1178,8 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ typedef uLong (*check_func) OF((uLong check, const Byte *buf, uInt len)); -voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); -void zcfree OF((voidp opaque, voidp ptr)); +static voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); +static void zcfree OF((voidp opaque, voidp ptr)); #define ZALLOC(strm, items, size) \ (*((strm)->zalloc))((strm)->opaque, (items), (size)) diff --git a/tools/quake3/common/unzip.c b/tools/quake3/common/unzip.c index d0659b18..1d4a919b 100644 --- a/tools/quake3/common/unzip.c +++ b/tools/quake3/common/unzip.c @@ -1199,8 +1199,8 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ typedef uLong (*check_func) OF((uLong check, const Byte *buf, uInt len)); -voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); -void zcfree OF((voidp opaque, voidp ptr)); +static voidp zcalloc OF((voidp opaque, unsigned items, unsigned size)); +static void zcfree OF((voidp opaque, voidp ptr)); #define ZALLOC(strm, items, size) \ (*((strm)->zalloc))((strm)->opaque, (items), (size))