From: <gew...@us...> - 2005-08-27 09:47:43
|
Update of /cvsroot/sc2/sc2/src/regex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25866 Modified Files: regcomp.ci Log Message: VC8 (VS 2005 beta 2) compilation fix: renamed errcode to err_code to avoid possible compiler bug Index: regcomp.ci =================================================================== RCS file: /cvsroot/sc2/sc2/src/regex/regcomp.ci,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** regcomp.ci 18 Apr 2005 14:12:51 -0000 1.1 --- regcomp.ci 27 Aug 2005 09:47:35 -0000 1.2 *************** *** 531,536 **** size_t ! regerror (errcode, preg, errbuf, errbuf_size) ! int errcode; const regex_t *preg; char *errbuf; --- 531,536 ---- size_t ! regerror (err_code, preg, errbuf, errbuf_size) ! int err_code; const regex_t *preg; char *errbuf; *************** *** 540,545 **** size_t msg_size; ! if (BE (errcode < 0 ! || errcode >= (int) (sizeof (__re_error_msgid_idx) / sizeof (__re_error_msgid_idx[0])), 0)) /* Only error codes returned by the rest of the code should be passed --- 540,545 ---- size_t msg_size; ! if (BE (err_code < 0 ! || err_code >= (int) (sizeof (__re_error_msgid_idx) / sizeof (__re_error_msgid_idx[0])), 0)) /* Only error codes returned by the rest of the code should be passed *************** *** 549,553 **** abort (); ! msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]); msg_size = strlen (msg) + 1; /* Includes the null. */ --- 549,553 ---- abort (); ! msg = gettext (__re_error_msgid + __re_error_msgid_idx[err_code]); msg_size = strlen (msg) + 1; /* Includes the null. */ |