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

Add 'wx_' prefix to builtin regfree and regerror

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-11-23 13:56:08 +00:00
parent 66d84d1130
commit 7553e636a2
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/regex/regerror.c
View File

@@ -50,7 +50,7 @@ static struct rerr {
*/
/* ARGSUSED */
size_t /* actual space needed (including NUL) */
regerror(rxerrcode, preg, errbuf, errbuf_size)
wx_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) */

4
src/regex/regex.h
View File

@@ -318,8 +318,8 @@ int regexec _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, regmatch_t [], i
#ifdef __REG_WIDE_T
int __REG_WIDE_EXEC _ANSI_ARGS_((regex_t *, __REG_CONST __REG_WIDE_T *, size_t, rm_detail_t *, size_t, regmatch_t [], int));
#endif
re_void regfree _ANSI_ARGS_((regex_t *));
extern size_t regerror _ANSI_ARGS_((int, __REG_CONST regex_t *, char *, size_t));
re_void wx_regfree _ANSI_ARGS_((regex_t *));
extern size_t wx_regerror _ANSI_ARGS_((int, __REG_CONST regex_t *, char *, size_t));
/* automatically gathered by fwd; do not hand-edit */
/* =====^!^===== end forwards =====^!^===== */

2
src/regex/regfree.c
View File

@@ -44,7 +44,7 @@
* Ignoring invocation with NULL is a convenience.
*/
VOID
regfree(re)
wx_regfree(re)
regex_t *re;
{
if (re == NULL)