From 2eb7668968c97a9e5a30e0994b3cd2759b42f9db Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sat, 3 May 2014 16:31:41 +0000 Subject: [PATCH] build fix for systems lacking vswscanf when wxUSE_UNICODE==0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/wxcrt.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp index 819700c2bf..f02b62582b 100644 --- a/src/common/wxcrt.cpp +++ b/src/common/wxcrt.cpp @@ -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 // 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") ); - wxCHECK_MSG( wxStrstr(format, wxT("%c")) == NULL, -1, + wxCHECK_MSG( wxStrstr(format, L"%c") == NULL, -1, wxT("incomplete vswscanf implementation doesn't allow %c") ); - return vsscanf(static_cast(wxConvLibc.cWX2MB(ws)), - wxConvLibc.cWX2MB(format), argptr); + return wxCRT_VsscanfA(static_cast(wxConvLibc.cWC2MB(ws)), + wxConvLibc.cWC2MB(format), argptr); } #endif