Changeset 40930 in vbox

Timestamp:

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

Author:

vboxsync

Message:

linux: build fix 3.4-rc3 [-fpermissive]

File:

• trunk/src/VBox/Runtime/common/alloc/heapoffset.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/alloc/heapoffset.cpp

@@ -508 +508 @@
 static PRTHEAPOFFSETBLOCK rtHeapOffsetAllocBlock(PRTHEAPOFFSETINTERNAL pHeapInt, size_t cb, size_t uAlignment)
 {
-    PRTHEAPOFFSETBLOCK  pRet = NULL;
+    PRTHEAPOFFSETBLOCK  pRet = (PRTHEAPOFFSETBLOCK)NULL;
     PRTHEAPOFFSETFREE   pFree;
 
-    AssertReturn((pHeapInt)->u32Magic == RTHEAPOFFSET_MAGIC, NULL);
+    AssertReturn((pHeapInt)->u32Magic == RTHEAPOFFSET_MAGIC, (PRTHEAPOFFSETBLOCK)NULL);
 #ifdef RTHEAPOFFSET_STRICT
     rtHeapOffsetAssertAll(pHeapInt);
@@ -704 +704 @@
      * of us (both lists are sorted by address).
      */
-    pLeft = NULL;
-    pRight = NULL;
+    pLeft = (PRTHEAPOFFSETFREE)NULL;
+    pRight = (PRTHEAPOFFSETFREE)NULL;
     if (pHeapInt->offFreeTail)
     {
@@ -814 +814 @@
 static void rtHeapOffsetAssertAll(PRTHEAPOFFSETINTERNAL pHeapInt)
 {
-    PRTHEAPOFFSETFREE pPrev = NULL;
-    PRTHEAPOFFSETFREE pPrevFree = NULL;
+    PRTHEAPOFFSETFREE pPrev = (PRTHEAPOFFSETFREE)NULL;
+    PRTHEAPOFFSETFREE pPrevFree = (PRTHEAPOFFSETFREE)NULL;
     PRTHEAPOFFSETFREE pBlock;
     for (pBlock = (PRTHEAPOFFSETFREE)(pHeapInt + 1);