diff options
| author | truelight <truelight@openttd.org> | 2007-08-03 23:26:12 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2007-08-03 23:26:12 +0000 |
| commit | b3bed1eda1001aa5cabe3df4f8686cc1f42bb2b8 (patch) | |
| tree | 47bcbff81f8436d0eb4b71288672b2917abb4e8d /src/misc | |
| parent | c76c4bf6e9f7fe8e0537ec96a7cc00d5e7273502 (diff) | |
| download | openttd-b3bed1eda1001aa5cabe3df4f8686cc1f42bb2b8.tar.xz | |
(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
Diffstat (limited to 'src/misc')
| -rw-r--r-- | src/misc/strapi.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<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) |