[ros-diffs] [tkreuzer] 50541: [PSDK] Fix inline definition of STRSAFEAPI for MSVC

Author: tkreuzer
Date: Fri Jan 28 19:41:28 2011
New Revision: 50541

URL: http://svn.reactos.org/svn/reactos?rev=50541&view=rev
Log:
[PSDK]
Fix inline definition of STRSAFEAPI for MSVC

Modified:
    branches/cmake-bringup/include/psdk/strsafe.h

Modified: branches/cmake-bringup/include/psdk/strsafe.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/strs…
==============================================================================
--- branches/cmake-bringup/include/psdk/strsafe.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/psdk/strsafe.h [iso-8859-1] Fri Jan 28 19:41:28 2011
@@ -239,7 +239,11 @@
 #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 @@
 
     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,