Changeset 40934 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Apr 16, 2012 5:53:05 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77485

Message:

Runtime: linux 3.4-rc3 build fix [-fpermissive]

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• alloc-r0drv.cpp (modified) (1 diff)
• memobj-r0drv.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/alloc-r0drv.cpp

@@ -85 +85 @@
     int rc = rtR0MemAllocEx(cb, fFlags, &pHdr);
     if (RT_FAILURE(rc))
-        return NULL;
+        return (PRTMEMHDR)NULL;
     return pHdr;
 }

trunk/src/VBox/Runtime/r0drv/memobj-r0drv.cpp

@@ -338 +338 @@
         {
             PRTR0MEMOBJINTERNAL pChild = pMem->uRel.Parent.papMappings[--pMem->uRel.Parent.cMappings];
-            pMem->uRel.Parent.papMappings[pMem->uRel.Parent.cMappings] = NULL;
+            pMem->uRel.Parent.papMappings[pMem->uRel.Parent.cMappings] = (PRTR0MEMOBJINTERNAL)NULL;
 
             /* sanity checks. */