summaryrefslogtreecommitdiff
path: root/zutil.c
diff options
context:
space:
mode:
authorNathan Moinvaziri <nathan@nathanm.com>2019-07-18 04:21:13 -0700
committerHans Kristian Rosbach <hk-github@circlestorm.org>2019-07-18 13:21:13 +0200
commitf06c71f9817700eccb507f54249a8c52335bf693 (patch)
tree830aa316289d6637d3ec024ea5da78a23327267e /zutil.c
parentd746d233c1dc70e0717877bccf8d9dc099d056d5 (diff)
Add zng_ prefix to internal functions to avoid linking conflicts with zlib. (#363)
Diffstat (limited to 'zutil.c')
-rw-r--r--zutil.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/zutil.c b/zutil.c
index 4373586..7553db8 100644
--- a/zutil.c
+++ b/zutil.c
@@ -14,7 +14,7 @@
# include "malloc.h"
#endif
-const char * const z_errmsg[10] = {
+const char * const zng_errmsg[10] = {
(const char *)"need dictionary", /* Z_NEED_DICT 2 */
(const char *)"stream end", /* Z_STREAM_END 1 */
(const char *)"", /* Z_OK 0 */
@@ -120,7 +120,7 @@ const char * ZEXPORT PREFIX(zError)(int err)
#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-void ZLIB_INTERNAL *zcalloc (void *opaque, unsigned items, unsigned size)
+void ZLIB_INTERNAL *zng_calloc (void *opaque, unsigned items, unsigned size)
{
(void)opaque;
#ifndef UNALIGNED_OK
@@ -131,7 +131,7 @@ void ZLIB_INTERNAL *zcalloc (void *opaque, unsigned items, unsigned size)
#endif
}
-void ZLIB_INTERNAL zcfree (void *opaque, void *ptr)
+void ZLIB_INTERNAL zng_cfree (void *opaque, void *ptr)
{
(void)opaque;
free(ptr);