Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PSDK]

Browse source 
Fix inline definition of STRSAFEAPI for MSVC

svn path=/branches/cmake-bringup/; revision=50541
This commit is contained in:
Timo Kreuzer 2011-01-28 19:41:28 +00:00
parent 0f56e5955a
commit 56a3daafd4
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/psdk/strsafe.h
View file

@ -239,7 +239,11 @@ STRSAFEAPI StringCxxVPrintfEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPT
#else // !STRSAFE_LIB #else // !STRSAFE_LIB
/* Create inlined versions */ /* Create inlined versions */
#ifdef __GNUC__
#define STRSAFEAPI HRESULT static __inline__ #define STRSAFEAPI HRESULT static __inline__
#else
#define STRSAFEAPI HRESULT __inline
#endif
#define STRSAFE_MAX_CXX STRSAFE_CCHtoCXX(STRSAFE_MAX_CCH) #define STRSAFE_MAX_CXX STRSAFE_CCHtoCXX(STRSAFE_MAX_CCH)
@ -497,7 +501,7 @@ StringCxxVPrintfEx(
if (SUCCEEDED(hr)) 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, memset(pszDest + iResult + 1,
dwFlags & 0xff, dwFlags & 0xff,