From 56a3daafd4b0aefce860fbdaaffb4fab3ebf3d71 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Fri, 28 Jan 2011 19:41:28 +0000 Subject: [PATCH] [PSDK] Fix inline definition of STRSAFEAPI for MSVC svn path=/branches/cmake-bringup/; revision=50541 --- include/psdk/strsafe.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/psdk/strsafe.h b/include/psdk/strsafe.h index c9953c1b9b8..0f84a20dd77 100644 --- a/include/psdk/strsafe.h +++ b/include/psdk/strsafe.h @@ -239,7 +239,11 @@ STRSAFEAPI StringCxxVPrintfEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPT #else // !STRSAFE_LIB /* Create inlined versions */ +#ifdef __GNUC__ #define STRSAFEAPI HRESULT static __inline__ +#else +#define STRSAFEAPI HRESULT __inline +#endif #define STRSAFE_MAX_CXX STRSAFE_CCHtoCXX(STRSAFE_MAX_CCH) @@ -497,7 +501,7 @@ StringCxxVPrintfEx( if (SUCCEEDED(hr)) { - if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && (iResult + 1 < cchMax)) + if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && ((size_t)iResult + 1 < cchMax)) { memset(pszDest + iResult + 1, dwFlags & 0xff,