From b3bed1eda1001aa5cabe3df4f8686cc1f42bb2b8 Mon Sep 17 00:00:00 2001 From: truelight Date: Fri, 3 Aug 2007 23:26:12 +0000 Subject: (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 --- src/misc/strapi.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/misc/strapi.hpp') diff --git a/src/misc/strapi.hpp b/src/misc/strapi.hpp index 33e22d5b9..48cfb0f8c 100644 --- a/src/misc/strapi.hpp +++ b/src/misc/strapi.hpp @@ -38,7 +38,7 @@ template <> /*static*/ inline size_t CStrApiBaseT::StrLen(const char *s) /** ::vsprintf wrapper specialization for char */ template <> /*static*/ inline int CStrApiBaseT::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::StrLen(const wchar_t /** ::vsprintf wrapper specialization for wchar_t */ template <> /*static*/ inline int CStrApiBaseT::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) -- cgit v1.2.3-70-g09d2