Browse Source

removed naming conflict for vc2008

Zachary Pavlov 18 years ago
parent
commit
cff3753ef5
1 changed files with 5 additions and 5 deletions
  1. 5 5
      ppremake/gnu_regex.c

+ 5 - 5
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.  */
    from either regcomp or regexec.   We don't use PREG here.  */
 
 
 size_t
 size_t
-regerror (errcode, preg, errbuf, errbuf_size)
-    int errcode;
+regerror (error_code, preg, errbuf, errbuf_size)
+    int error_code;
     const regex_t *preg;
     const regex_t *preg;
     char *errbuf;
     char *errbuf;
     size_t errbuf_size;
     size_t errbuf_size;
@@ -4886,15 +4886,15 @@ regerror (errcode, preg, errbuf, errbuf_size)
   const char *msg;
   const char *msg;
   size_t msg_size;
   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 
     /* 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
        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.
        code generates an invalid error code, then the program has a bug.
        Dump core so we can fix it.  */
        Dump core so we can fix it.  */
     abort ();
     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
   /* POSIX doesn't require that we do anything in this case, but why
      not be nice.  */
      not be nice.  */