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

compilation fix for ANSI build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-01 13:04:26 +00:00
parent 77fa3d8243
commit 96202d070a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/ifacecheck/src/xmlparser.cpp
View File

@@ -484,10 +484,10 @@ typedef std::map<unsigned long, toResolveTypeItem> wxToResolveTypeHashMap;
bool getID(unsigned long *id, const wxStringCharType* str) bool getID(unsigned long *id, const wxStringCharType* str)
{ {
wxStringCharType *end; wxStringCharType *end;
#if wxUSE_UNICODE_UTF8 #if wxUSE_UNICODE_WCHAR
unsigned long val = strtoul(str+1, &end, GCCXML_BASE);
#else
unsigned long val = wcstoul(str+1, &end, GCCXML_BASE); unsigned long val = wcstoul(str+1, &end, GCCXML_BASE);
#else
unsigned long val = strtoul(str+1, &end, GCCXML_BASE);
#endif #endif
// return true only if scan was stopped by the terminating NUL and // 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 <Class> ones... i.e. numeric values separed by " _" token // in nodes like <Class> ones... i.e. numeric values separed by " _" token
bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxStringCharType* str) bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxStringCharType* str)
{ {
#if wxUSE_UNICODE_UTF8 #if wxUSE_UNICODE_WCHAR
size_t len = strlen(str);
#else
size_t len = wcslen(str); size_t len = wcslen(str);
#else
size_t len = strlen(str);
#endif #endif
if (len == 0 || str[0] != '_') 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: // curpos always points to the underscore of the next token to parse:
#if wxUSE_UNICODE_UTF8 #if wxUSE_UNICODE_UTF8
unsigned long id = strtoul(curpos+1, &nexttoken, GCCXML_BASE);
#else
unsigned long id = wcstoul(curpos+1, &nexttoken, GCCXML_BASE); unsigned long id = wcstoul(curpos+1, &nexttoken, GCCXML_BASE);
#else
unsigned long id = strtoul(curpos+1, &nexttoken, GCCXML_BASE);
#endif #endif
if ( *nexttoken != ' ' || errno == ERANGE || errno == EINVAL ) if ( *nexttoken != ' ' || errno == ERANGE || errno == EINVAL )
return false; return false;