From 951f792f7dbf786f9606db193017a1e58c675b5c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 2 May 2009 15:25:38 +0000 Subject: [PATCH] WinCE doesn't provide strnlen/wcsnlen() until version 6.0 (closes #10763) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxcrtbase.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h index e37774cbe4..0d124f6f35 100644 --- a/include/wx/wxcrtbase.h +++ b/include/wx/wxcrtbase.h @@ -228,12 +228,24 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); #endif /* HAVE_WCSTOULL */ #endif -/* Not all compilers have strnlen(); e.g. MSVC 6.x and 7.x don't have it */ -#if wxCHECK_VISUALC_VERSION(8) || defined(HAVE_STRNLEN) +/* + Only VC8 and later provide strnlen() and wcsnlen() functions under Windows + and it's also only available starting from Windows CE 6.0 only in CE build. + */ +#if wxCHECK_VISUALC_VERSION(8) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 600)) + #ifndef HAVE_STRNLEN + #define HAVE_STRNLEN + #endif + #ifndef HAVE_WCSNLEN + #define HAVE_WCSNLEN + #endif +#endif + +#ifdef HAVE_STRNLEN #define wxCRT_StrnlenA strnlen #endif -#if wxCHECK_VISUALC_VERSION(8) || defined(HAVE_WCSNLEN) +#ifdef HAVE_WCSNLEN #define wxCRT_StrnlenW wcsnlen #endif