diff options
Diffstat (limited to 'regerror.c')
| -rw-r--r-- | regerror.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/regerror.c b/regerror.c index 560b5e12c5..348b7b30ed 100644 --- a/regerror.c +++ b/regerror.c @@ -30,13 +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 char* onig_error_code_to_format(int code) @@ -185,21 +179,14 @@ onig_error_code_to_format(int code) #define MAX_ERROR_PAR_LEN 30 extern int -#ifdef HAVE_STDARG_PROTOTYPES onig_error_code_to_str(UChar* s, int code, ...) -#else -onig_error_code_to_str(s, code, va_alist) - UChar* s; - int code; - va_dcl -#endif { UChar *p, *q; OnigErrorInfo* einfo; int len; va_list vargs; - va_init_list(vargs, code); + va_start(vargs, code); switch (code) { case ONIGERR_UNDEFINED_NAME_REFERENCE: @@ -255,26 +242,15 @@ onig_error_code_to_str(s, code, va_alist) void -#ifdef HAVE_STDARG_PROTOTYPES onig_snprintf_with_pattern(char buf[], int bufsize, OnigEncoding enc, char* pat, char* pat_end, char *fmt, ...) -#else -onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist) - char buf[]; - int bufsize; - OnigEncoding enc; - char* pat; - char* pat_end; - const char *fmt; - va_dcl -#endif { int n, need, len; UChar *p, *s, *bp; char bs[6]; va_list args; - va_init_list(args, fmt); + va_start(args, fmt); n = vsnprintf(buf, bufsize, fmt, args); va_end(args); |