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

a better fix for using builtin regex under BSD (also fixes compilation for Mac OS X) (patch 1089445)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-04 09:37:55 +00:00
parent 1b072e196e
commit 2af7511ea7
3 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/regex.cpp
View File

@@ -199,7 +199,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
// compile it
#ifdef __REG_NOFRONT
bool conv = true;
int errorcode = re_comp(&m_RegEx, expr, expr.length(), flagsRE);
int errorcode = wx_re_comp(&m_RegEx, expr, expr.length(), flagsRE);
#else
const wxWX2MBbuf conv = expr.mbc_str();
int errorcode = conv ? regcomp(&m_RegEx, conv, flagsRE) : REG_BADPAT;
@@ -283,7 +283,7 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
// do match it
#ifdef __REG_NOFRONT
bool conv = true;
int rc = re_exec(&self->m_RegEx, str, wxStrlen(str), NULL, m_nMatches, m_Matches, flagsRE);
int rc = wx_re_exec(&self->m_RegEx, str, wxStrlen(str), NULL, m_nMatches, m_Matches, flagsRE);
#else
const wxWX2MBbuf conv = wxConvertWX2MB(str);
int rc = conv ? regexec(&self->m_RegEx, conv, m_nMatches, m_Matches, flagsRE) : REG_BADPAT;