From cff3753ef5410e58577104b079c6be1b8490c8b2 Mon Sep 17 00:00:00 2001 From: Zachary Pavlov Date: Mon, 16 Jul 2007 18:02:57 +0000 Subject: [PATCH] removed naming conflict for vc2008 --- ppremake/gnu_regex.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ppremake/gnu_regex.c b/ppremake/gnu_regex.c index c340d1f523..ae660560bb 100644 --- a/ppremake/gnu_regex.c +++ b/ppremake/gnu_regex.c @@ -4877,8 +4877,8 @@ regexec (preg, string, nmatch, pmatch, eflags) from either regcomp or regexec. We don't use PREG here. */ size_t -regerror (errcode, preg, errbuf, errbuf_size) - int errcode; +regerror (error_code, preg, errbuf, errbuf_size) + int error_code; const regex_t *preg; char *errbuf; size_t errbuf_size; @@ -4886,15 +4886,15 @@ regerror (errcode, preg, errbuf, errbuf_size) const char *msg; size_t msg_size; - if (errcode < 0 - || errcode >= (sizeof (re_error_msg) / sizeof (re_error_msg[0]))) + if (error_code < 0 + || error_code >= (sizeof (re_error_msg) / sizeof (re_error_msg[0]))) /* Only error codes returned by the rest of the code should be passed to this routine. If we are given anything else, or if other regex code generates an invalid error code, then the program has a bug. Dump core so we can fix it. */ abort (); - msg = re_error_msg[errcode]; + msg = re_error_msg[error_code]; /* POSIX doesn't require that we do anything in this case, but why not be nice. */