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

build fix for systems lacking vswscanf when wxUSE_UNICODE==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-05-03 16:31:41 +00:00
parent 5b8e5e81b6
commit 2eb7668968
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/wxcrt.cpp
View File

@@ -299,13 +299,13 @@ static int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
// of the function. This doesn't work with %c and %s because of difference // of the function. This doesn't work with %c and %s because of difference
// in size of char and wchar_t, though. // in size of char and wchar_t, though.
wxCHECK_MSG( wxStrstr(format, wxT("%s")) == NULL, -1, wxCHECK_MSG( wxStrstr(format, L"%s") == NULL, -1,
wxT("incomplete vswscanf implementation doesn't allow %s") ); wxT("incomplete vswscanf implementation doesn't allow %s") );
wxCHECK_MSG( wxStrstr(format, wxT("%c")) == NULL, -1, wxCHECK_MSG( wxStrstr(format, L"%c") == NULL, -1,
wxT("incomplete vswscanf implementation doesn't allow %c") ); wxT("incomplete vswscanf implementation doesn't allow %c") );
return vsscanf(static_cast<const char*>(wxConvLibc.cWX2MB(ws)), return wxCRT_VsscanfA(static_cast<const char*>(wxConvLibc.cWC2MB(ws)),
wxConvLibc.cWX2MB(format), argptr); wxConvLibc.cWC2MB(format), argptr);
} }
#endif #endif