From a8ddb18623c5d0c78031176a30b27530a9d9c368 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 4 Sep 2002 15:06:46 +0000 Subject: [PATCH 1/1] should fix Unicode build for BC++ 5.3 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxchar.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index d120ab33d8..07871991b1 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -309,6 +309,13 @@ #define wxVsscanf _vstscanf #define wxVsprintf _vstprintf + // special case: not all TCHAR-aware compilers have those + #if defined(__VISUALC__) || \ + (defined(__BORLANDC__) && __BORLANDC__ >= 0x540) + #define wxVsnprintf_ _vsntprintf + #define wxSnprintf_ _sntprintf + #endif + // special case: these functions are missing under Win9x with Unicows so we // have to implement them ourselves #if wxUSE_UNICODE_MSLU @@ -576,10 +583,7 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use We define function with a trailing underscore here because the real one is a wrapper around it as explained below */ -#ifdef wxHAVE_TCHAR_SUPPORT - #define wxVsnprintf_ _vsntprintf - #define wxSnprintf_ _sntprintf -#else // !TCHAR +#ifndef wxVsnprintf_ #if wxUSE_UNICODE #if defined(HAVE_VSWPRINTF) #define wxVsnprintf_ vswprintf @@ -593,7 +597,7 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use #define wxSnprintf_ snprintf #endif #endif -#endif // TCHAR/!TCHAR +#endif // wxVsnprintf_ not defined yet #ifndef wxVsnprintf_ // no [v]snprintf(), cook our own -- 2.47.2