From 24c96d96bcd61bf1a7c0cf963277252a4ba9f5b6 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sun, 27 Nov 2005 18:04:06 +0000 Subject: [PATCH] wx_wcscmp is only used in unicode mode so wrap in #if wxUSE_UNICODE to avoid a warning about an unused function, and clean up the function at the same time. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/strings/strings.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp index 6abc91a11b..090b49aaab 100644 --- a/tests/strings/strings.cpp +++ b/tests/strings/strings.cpp @@ -228,20 +228,19 @@ void StringTestCase::Conversion() #endif } +#if !wxUSE_UNICODE // 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; + while (*s1 == *s2 && *s1 != 0) + { s1++; s2++; } - return 0; + return *s1 - *s2; } +#endif void StringTestCase::DoTestConversion(const char *s, -- 2.50.0