X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1701c4d42145de20ece5ddb87c7f4b993445bf77..67edd0c796f1aef51bd00857e253c097de5f2c75:/src/regex/regex.h diff --git a/src/regex/regex.h b/src/regex/regex.h index 8f83871638..03498bbf7b 100644 --- a/src/regex/regex.h +++ b/src/regex/regex.h @@ -109,8 +109,8 @@ extern "C" { #endif #if wxUSE_UNICODE # define __REG_WIDE_T wxChar -# define __REG_WIDE_COMPILE re_comp -# define __REG_WIDE_EXEC re_exec +# define __REG_WIDE_COMPILE wx_re_comp +# define __REG_WIDE_EXEC wx_re_exec # define __REG_NOCHAR /* don't want the char versions */ #endif #define __REG_NOFRONT /* don't want regcomp() and regexec() */ @@ -301,7 +301,7 @@ typedef struct { /* automatically gathered by fwd; do not hand-edit */ /* === regproto.h === */ #ifndef __REG_NOCHAR -int re_comp _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, int)); +int wx_re_comp _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, int)); #endif #ifndef __REG_NOFRONT int regcomp _ANSI_ARGS_((regex_t *, __REG_CONST char *, int)); @@ -310,7 +310,7 @@ int regcomp _ANSI_ARGS_((regex_t *, __REG_CONST char *, int)); int __REG_WIDE_COMPILE _ANSI_ARGS_((regex_t *, __REG_CONST __REG_WIDE_T *, size_t, int)); #endif #ifndef __REG_NOCHAR -int re_exec _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, rm_detail_t *, size_t, regmatch_t [], int)); +int wx_re_exec _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, rm_detail_t *, size_t, regmatch_t [], int)); #endif #ifndef __REG_NOFRONT int regexec _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, regmatch_t [], int));