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
This commit is contained in:
Vadim Zeitlin
2002-09-04 15:06:46 +00:00
parent ca8e52b3d2
commit a8ddb18623

View File

@@ -309,6 +309,13 @@
#define wxVsscanf _vstscanf #define wxVsscanf _vstscanf
#define wxVsprintf _vstprintf #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 // special case: these functions are missing under Win9x with Unicows so we
// have to implement them ourselves // have to implement them ourselves
#if wxUSE_UNICODE_MSLU #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 We define function with a trailing underscore here because the real one is a
wrapper around it as explained below wrapper around it as explained below
*/ */
#ifdef wxHAVE_TCHAR_SUPPORT #ifndef wxVsnprintf_
#define wxVsnprintf_ _vsntprintf
#define wxSnprintf_ _sntprintf
#else // !TCHAR
#if wxUSE_UNICODE #if wxUSE_UNICODE
#if defined(HAVE_VSWPRINTF) #if defined(HAVE_VSWPRINTF)
#define wxVsnprintf_ vswprintf #define wxVsnprintf_ vswprintf
@@ -593,7 +597,7 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use
#define wxSnprintf_ snprintf #define wxSnprintf_ snprintf
#endif #endif
#endif #endif
#endif // TCHAR/!TCHAR #endif // wxVsnprintf_ not defined yet
#ifndef wxVsnprintf_ #ifndef wxVsnprintf_
// no [v]snprintf(), cook our own // no [v]snprintf(), cook our own