From ecfb80367e891394f5bc0eaf52523b7fc71ab878 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 25 Mar 2014 20:28:20 +0100 Subject: Add va_copy/va_copy_end macros to support both C89 and C99. --- source/fitz/buffer.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'source/fitz/buffer.c') diff --git a/source/fitz/buffer.c b/source/fitz/buffer.c index e9295a26..4a87b4ca 100644 --- a/source/fitz/buffer.c +++ b/source/fitz/buffer.c @@ -237,15 +237,9 @@ fz_buffer_vprintf(fz_context *ctx, fz_buffer *buffer, const char *fmt, va_list o va_list args; slack = buffer->cap - buffer->len; -#ifdef _MSC_VER /* Microsoft Visual C */ - args = old_args; -#else va_copy(args, old_args); -#endif len = fz_vsnprintf((char *)buffer->data + buffer->len, slack, fmt, args); -#ifndef _MSC_VER - va_end(args); -#endif + va_copy_end(args); /* len = number of chars written, not including the terminating * NULL, so len+1 > slack means "truncated". */ @@ -255,15 +249,9 @@ fz_buffer_vprintf(fz_context *ctx, fz_buffer *buffer, const char *fmt, va_list o fz_ensure_buffer(ctx, buffer, buffer->len + len); slack = buffer->cap - buffer->len; -#ifdef _MSC_VER /* Microsoft Visual C */ - args = old_args; -#else va_copy(args, old_args); -#endif len = fz_vsnprintf((char *)buffer->data + buffer->len, slack, fmt, args); -#ifndef _MSC_VER - va_end(args); -#endif + va_copy_end(args); } buffer->len += len; -- cgit v1.2.3