Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed errcode to fix compilation with VC++ 8 (replaces patch 982303)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-07-05 10:40:06 +00:00
parent dc66ae687b
commit f43bb7e246
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/regex/regerror.c
View File

@@ -50,8 +50,8 @@ static struct rerr {
*/ */
/* ARGSUSED */ /* ARGSUSED */
size_t /* actual space needed (including NUL) */ size_t /* actual space needed (including NUL) */
regerror(errcode, preg, errbuf, errbuf_size) regerror(rxerrcode, preg, errbuf, errbuf_size)
int errcode; /* error code, or REG_ATOI or REG_ITOA */ int rxerrcode; /* error code, or REG_ATOI or REG_ITOA */
CONST regex_t *preg; /* associated regex_t (unused at present) */ CONST regex_t *preg; /* associated regex_t (unused at present) */
char *errbuf; /* result buffer (unless errbuf_size==0) */ char *errbuf; /* result buffer (unless errbuf_size==0) */
size_t errbuf_size; /* available space in errbuf, can be 0 */ size_t errbuf_size; /* available space in errbuf, can be 0 */
@@ -62,7 +62,7 @@ size_t errbuf_size; /* available space in errbuf, can be 0 */
size_t len; size_t len;
int icode; int icode;
switch (errcode) { switch (rxerrcode) {
case REG_ATOI: /* convert name to number */ case REG_ATOI: /* convert name to number */
for (r = rerrs; r->code >= 0; r++) for (r = rerrs; r->code >= 0; r++)
if (strcmp(r->name, errbuf) == 0) if (strcmp(r->name, errbuf) == 0)
@@ -84,12 +84,12 @@ size_t errbuf_size; /* available space in errbuf, can be 0 */
break; break;
default: /* a real, normal error code */ default: /* a real, normal error code */
for (r = rerrs; r->code >= 0; r++) for (r = rerrs; r->code >= 0; r++)
if (r->code == errcode) if (r->code == rxerrcode)
break; break;
if (r->code >= 0) if (r->code >= 0)
msg = r->explain; msg = r->explain;
else { /* unknown; say so */ else { /* unknown; say so */
sprintf(convbuf, unk, errcode); sprintf(convbuf, unk, rxerrcode);
msg = convbuf; msg = convbuf;
} }
break; break;