Replacements for some wcsxxx funcs for systems without them like osx 10.2.

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

diff --git a/tests/mbconv/mbconvtest.cpp b/tests/mbconv/mbconvtest.cpp
index 450e0ce183d3634a85a4fc1bad89b613ef0b099c..51eb23e96f1c189b98521b5d667bae1d96728751 100644 (file)
--- a/tests/mbconv/mbconvtest.cpp
+++ b/tests/mbconv/mbconvtest.cpp
@@ -201,6 +201,28 @@ void MBConvTestCase::UTF8Octal(const char *charSequence,
     UTF8(charSequence, NULL, wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
 }
 
     UTF8(charSequence, NULL, wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
 }
 

+// in case wcscpy is missing
+//
+static wchar_t *wx_wcscpy(wchar_t *dest, const wchar_t *src)
+{
+    wchar_t *d = dest; 
+    while ((*d++ = *src++) != 0)
+        ;
+    return dest;
+}
+
+// in case wcscat is missing
+//
+static wchar_t *wx_wcscat(wchar_t *dest, const wchar_t *src)
+{
+    wchar_t *d = dest; 
+    while (*d)
+        d++;
+    while ((*d++ = *src++) != 0)
+        ;
+    return dest;
+}
+

 // include the option in the error messages so it's possible to see which
 // test failed
 #define UTF8ASSERT(expr) CPPUNIT_ASSERT_MESSAGE(#expr + errmsg,  expr)
 // include the option in the error messages so it's possible to see which
 // test failed
 #define UTF8ASSERT(expr) CPPUNIT_ASSERT_MESSAGE(#expr + errmsg,  expr)


@@ -240,11 +262,11 @@ void MBConvTestCase::UTF8(const char *charSequence,
         wxASSERT(result < BUFSIZE);
 
         wchar_t expected[BUFSIZE];
         wxASSERT(result < BUFSIZE);
 
         wchar_t expected[BUFSIZE];

-        wcscpy(expected, wideSequence);
-        wcscat(expected, L"ABC");
-        wcscat(expected, wideSequence);
-        wcscat(expected, L"XYZ");
-        wcscat(expected, wideSequence);
+        wx_wcscpy(expected, wideSequence);
+        wx_wcscat(expected, L"ABC");
+        wx_wcscat(expected, wideSequence);
+        wx_wcscat(expected, L"XYZ");
+        wx_wcscat(expected, wideSequence);

 
         UTF8ASSERT(wcscmp(widechars, expected) == 0);
         UTF8ASSERT(wcslen(widechars) == result);
 
         UTF8ASSERT(wcscmp(widechars, expected) == 0);
         UTF8ASSERT(wcslen(widechars) == result);

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index aafd0dba577ab24406132e0ca379678d53dae05c..c62abad45d30c8f88cca6d62ada880aa619b5d31 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -222,6 +222,21 @@ void StringTestCase::Conversion()
 #endif
 }
 
 #endif
 }
 

+// in case wcscmp is missing
+//
+static int wx_wcscmp(const wchar_t *s1, const wchar_t *s2)
+{
+    for (;;) {
+        if (*s1 != *s2)
+            return *s1 - *s2;
+        if (*s1 == 0)
+            break;
+        s1++;
+        s2++;
+    }
+    return 0;
+}
+

 void
 StringTestCase::DoTestConversion(const char *s,
                                  const wchar_t *ws,
 void
 StringTestCase::DoTestConversion(const char *s,
                                  const wchar_t *ws,


@@ -240,7 +255,7 @@ StringTestCase::DoTestConversion(const char *s,
         wxWCharBuffer wbuf(wxString(s).wc_str(conv));
 
         if ( ws )
         wxWCharBuffer wbuf(wxString(s).wc_str(conv));
 
         if ( ws )

-            CPPUNIT_ASSERT( wcscmp(wbuf, ws) == 0 );
+            CPPUNIT_ASSERT( wx_wcscmp(wbuf, ws) == 0 );

         else
             CPPUNIT_ASSERT( !*wbuf );
     }
         else
             CPPUNIT_ASSERT( !*wbuf );
     }