From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 5 Jul 2004 10:40:06 +0000 (+0000)
Subject: renamed errcode to fix compilation with VC++  8 (replaces patch 982303)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f43bb7e246603413a43382e43e480972687eca92?ds=sidebyside

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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