compilation fixes for ANSI build

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

diff --git a/tests/regex/regextest.cpp b/tests/regex/regextest.cpp
index ef63306560d8f04c85f2ccb53a729cba757517c9..bd0895085990dcc2118f9e01b16d3997eb4a6b89 100644 (file)
--- a/tests/regex/regextest.cpp
+++ b/tests/regex/regextest.cpp
@@ -158,7 +158,7 @@ int wxWcscmp(const wchar_t* s1, const wchar_t* s2)
     if (nLen1 != nLen2)
         return nLen1 - nLen2;
 
     if (nLen1 != nLen2)
         return nLen1 - nLen2;
 

-    return wxTmemcmp(s1, s2, nLen1);
+    return memcmp(s1, s2, nLen1*sizeof(wchar_t));

 }
 
 // convert a string from UTF8 to the internal encoding
 }
 
 // convert a string from UTF8 to the internal encoding


@@ -324,7 +324,7 @@ wxString RegExTestCase::quote(const wxString& arg)
     wxString str;
 
     for (size_t i = 0; i < arg.length(); i++) {
     wxString str;
 
     for (size_t i = 0; i < arg.length(); i++) {

-        wxUChar ch = (wxChar)arg[i];
+        wxChar ch = (wxChar)arg[i];

         const wxChar *p = wxStrchr(needEscape, ch);
 
         if (p)
         const wxChar *p = wxStrchr(needEscape, ch);
 
         if (p)