RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed naming conflict for vc2008

This commit is contained in:
Zachary Pavlov 2007-07-16 18:02:57 +00:00
parent 7b0bb21bbe
commit cff3753ef5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ppremake/gnu_regex.c
View File

@ -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. */