From 54ac6804009345264311acba728d0c752134e17e Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 6 Jan 2016 22:19:07 +0100 Subject: [PATCH] fix merge conflict. --- contrib/zlib/gzwrite.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/zlib/gzwrite.c b/contrib/zlib/gzwrite.c index 5e1d53949..3ed161f44 100644 --- a/contrib/zlib/gzwrite.c +++ b/contrib/zlib/gzwrite.c @@ -351,10 +351,10 @@ int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) # endif #else # ifdef HAS_vsnprintf_void - (void)vai_snprintf((char *)(state->in), size, format, va); + (void)vsnprintf((char *)(state->in), size, format, va); len = strlen((char *)(state->in)); # else - len = vai_snprintf((char *)(state->in), size, format, va); + len = vsnprintf((char *)(state->in), size, format, va); # endif #endif @@ -438,11 +438,11 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, # endif #else # ifdef HAS_snprintf_void - ai_snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8, + snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); len = strlen((char *)(state->in)); # else - len = ai_snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, + len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); # endif