From: Václav Slavík Date: Thu, 1 Jul 2010 15:28:35 +0000 (+0000) Subject: Fix printf arguments validation code for ANSI build. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/afc1f37c6520b5d72bdc10f937874787e16f6d3a Fix printf arguments validation code for ANSI build. char arguments weren't recognized as allowed variadic types. Unlike in Unicode build, where chars are treated specially, they are primitive types in ANSI build. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h index cc14ce2ddb..21977e8e40 100644 --- a/include/wx/strvararg.h +++ b/include/wx/strvararg.h @@ -408,6 +408,12 @@ wxFORMAT_STRING_SPECIFIER(long double, wxFormatString::Arg_LongDouble) wxFORMAT_STRING_SPECIFIER(wchar_t, wxFormatString::Arg_Char | wxFormatString::Arg_Int) #endif +#if !wxUSE_UNICODE +wxFORMAT_STRING_SPECIFIER(char, wxFormatString::Arg_Char | wxFormatString::Arg_Int) +wxFORMAT_STRING_SPECIFIER(signed char, wxFormatString::Arg_Char | wxFormatString::Arg_Int) +wxFORMAT_STRING_SPECIFIER(unsigned char, wxFormatString::Arg_Char | wxFormatString::Arg_Int) +#endif + wxFORMAT_STRING_SPECIFIER(char*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(unsigned char*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer) wxFORMAT_STRING_SPECIFIER(signed char*, wxFormatString::Arg_String | wxFormatString::Arg_Pointer)