Changeset 40931 in vbox for trunk/include

Timestamp:

Apr 16, 2012 3:32:32 AM (13 years ago)

Author:

vboxsync

Message:

linux: 3.4-rc3 build fix [-fpermissive]

Location:

trunk/include/iprt

Files:

• asm.h (modified) (1 diff)
• string.h (modified) (1 diff)

trunk/include/iprt/asm.h

@@ -3364 +3364 @@
         if (RT_UNLIKELY(*pu32 != u32))
             return (uint32_t *)pu32;
-    return NULL;
+    return (uint32_t *)NULL;
 }
 

trunk/include/iprt/string.h

@@ -1419 +1419 @@
 DECLINLINE(char *) RTLatin1PutCp(char *psz, RTUNICP CodePoint)
 {
-    AssertReturn(CodePoint < 0x100, NULL);
+    AssertReturn(CodePoint < 0x100, (char *)NULL);
     *psz++ = (unsigned char)CodePoint;
     return psz;