From 96202d070a4f0c7e2f346e0bba7da8580d45d02f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 1 Jun 2008 13:04:26 +0000 Subject: [PATCH] compilation fix for ANSI build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/ifacecheck/src/xmlparser.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/ifacecheck/src/xmlparser.cpp b/utils/ifacecheck/src/xmlparser.cpp index efbb827..2209075 100644 --- a/utils/ifacecheck/src/xmlparser.cpp +++ b/utils/ifacecheck/src/xmlparser.cpp @@ -484,10 +484,10 @@ typedef std::map wxToResolveTypeHashMap; bool getID(unsigned long *id, const wxStringCharType* str) { wxStringCharType *end; -#if wxUSE_UNICODE_UTF8 - unsigned long val = strtoul(str+1, &end, GCCXML_BASE); -#else +#if wxUSE_UNICODE_WCHAR unsigned long val = wcstoul(str+1, &end, GCCXML_BASE); +#else + unsigned long val = strtoul(str+1, &end, GCCXML_BASE); #endif // return true only if scan was stopped by the terminating NUL and @@ -504,10 +504,10 @@ bool getID(unsigned long *id, const wxStringCharType* str) // in nodes like ones... i.e. numeric values separed by " _" token bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxStringCharType* str) { -#if wxUSE_UNICODE_UTF8 - size_t len = strlen(str); -#else +#if wxUSE_UNICODE_WCHAR size_t len = wcslen(str); +#else + size_t len = strlen(str); #endif if (len == 0 || str[0] != '_') @@ -521,9 +521,9 @@ bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxStringCharTyp { // curpos always points to the underscore of the next token to parse: #if wxUSE_UNICODE_UTF8 - unsigned long id = strtoul(curpos+1, &nexttoken, GCCXML_BASE); -#else unsigned long id = wcstoul(curpos+1, &nexttoken, GCCXML_BASE); +#else + unsigned long id = strtoul(curpos+1, &nexttoken, GCCXML_BASE); #endif if ( *nexttoken != ' ' || errno == ERANGE || errno == EINVAL ) return false; -- 2.7.4