diff options
Diffstat (limited to 'regerror.c')
-rw-r--r-- | regerror.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/regerror.c b/regerror.c index 9ec3f65f4c..8a8f14c7dc 100644 --- a/regerror.c +++ b/regerror.c @@ -30,14 +30,7 @@ #include "regint.h" #include <stdio.h> /* for vsnprintf() */ - -#ifdef HAVE_STDARG_PROTOTYPES #include <stdarg.h> -#define va_init_list(a,b) va_start(a,b) -#else -#include <varargs.h> -#define va_init_list(a,b) va_start(a) -#endif extern UChar* onig_error_code_to_format(OnigPosition code) @@ -252,14 +245,7 @@ static int to_ascii(OnigEncoding enc, UChar *s, UChar *end, #define MAX_ERROR_PAR_LEN 30 extern int -#ifdef HAVE_STDARG_PROTOTYPES onig_error_code_to_str(UChar* s, OnigPosition code, ...) -#else -onig_error_code_to_str(s, code, va_alist) - UChar* s; - OnigPosition code; - va_dcl -#endif { UChar *p, *q; OnigErrorInfo* einfo; @@ -268,7 +254,7 @@ onig_error_code_to_str(s, code, va_alist) UChar parbuf[MAX_ERROR_PAR_LEN]; va_list vargs; - va_init_list(vargs, code); + va_start(vargs, code); switch (code) { case ONIGERR_UNDEFINED_NAME_REFERENCE: @@ -385,22 +371,11 @@ onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, } void -#ifdef HAVE_STDARG_PROTOTYPES onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...) -#else -onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist) - UChar buf[]; - int bufsize; - OnigEncoding enc; - UChar* pat; - UChar* pat_end; - const UChar *fmt; - va_dcl -#endif { va_list args; - va_init_list(args, fmt); + va_start(args, fmt); onig_vsnprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, args); va_end(args); |