(svn r10778) -Fix: one-liners to allow MSVC and WINCE to work together (or anyway, a step towards that goal)
-Fix: put DEBUG lines under WINCE via a function designed for just that under WINCE
This commit is contained in:
@@ -38,7 +38,7 @@ template <> /*static*/ inline size_t CStrApiBaseT<char>::StrLen(const char *s)
|
||||
/** ::vsprintf wrapper specialization for char */
|
||||
template <> /*static*/ inline int CStrApiBaseT<char>::SPrintFL(char *buf, size_t count, const char *fmt, va_list args)
|
||||
{
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1400) // VC 8.0 and above
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(WINCE) // VC 8.0 and above
|
||||
return ::vsnprintf_s(buf, count, count - 1, fmt, args);
|
||||
#else /* ! VC 8.0 and above */
|
||||
return ::vsnprintf(buf, count, fmt, args);
|
||||
@@ -55,7 +55,7 @@ template <> /*static*/ inline size_t CStrApiBaseT<wchar_t>::StrLen(const wchar_t
|
||||
/** ::vsprintf wrapper specialization for wchar_t */
|
||||
template <> /*static*/ inline int CStrApiBaseT<wchar_t>::SPrintFL(wchar_t *buf, size_t count, const wchar_t *fmt, va_list args)
|
||||
{
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1400) // VC 8.0 and above
|
||||
#if defined(_MSC_VER) && (_MSC_VER >= 1400) && !defined(WINCE) // VC 8.0 and above
|
||||
return ::_vsnwprintf_s(buf, count, count - 1, fmt, args);
|
||||
#else /* ! VC 8.0 and above */
|
||||
# if defined(_WIN32)
|
||||
|
Reference in New Issue
Block a user