VirtualBox

Ticket #15219: tosend.patch

File tosend.patch, 2.0 KB (added by sergiomb, 9 years ago)

fix 3 compile errors on gcc6

  • VirtualBox-5.0.17-105882/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp

    old new void VBoxDtMutexDelete(struct VBoxDtMute  
    12701270{
    12711271    AssertReturnVoid(pMtx != &g_DummyMtx);
    12721272    AssertPtr(pMtx);
    1273     if (pMtx->hMtx == NIL_RTSEMMUTEX || pMtx->hMtx == NULL)
     1273    if (pMtx->hMtx == NIL_RTSEMMUTEX)
    12741274        return;
    12751275
    12761276    Assert(pMtx->hOwner == NIL_RTNATIVETHREAD);
  • VirtualBox-5.0.17-105882/src/VBox/VMM/VMMR3/DBGFR3Trace.cpp

    old new static int dbgfR3TraceEnable(PVM pVM, ui  
    122122
    123123    rc = RTTraceBufCarve(&hTraceBuf, cEntries, cbEntry, 0 /*fFlags*/, pvBlock, &cbBlock);
    124124    AssertRCReturn(rc, rc);
    125     AssertRelease(hTraceBuf == (RTTRACEBUF)pvBlock && (void *)hTraceBuf == pvBlock);
     125    AssertRelease(hTraceBuf == (RTTRACEBUF)pvBlock);
    126126
    127127    pVM->hTraceBufR3 = hTraceBuf;
    128128    pVM->hTraceBufR0 = MMHyperCCToR0(pVM, hTraceBuf);
  • VirtualBox-5.0.17-105882/src/libs/kStuff/kStuff/kLdr/kLdrModMachO.c

    old new static int kldrModMachOPreParseLoadComm  
    868868                        offSect += pSect->size; \
    869869                    } while (0) /* VALIDATE_AND_ADD_SECTION */
    870870
    871                     VALIDATE_AND_ADD_SECTION(32);
     871                    //VALIDATE_AND_ADD_SECTION(32);
    872872
    873873                    /* next */
    874874                    pSect++;
    static int kldrModMachOPreParseLoadComm  
    920920                        pSect->reserved2 = K_E2E_U32(pSect->reserved2);
    921921                    }
    922922
    923                     VALIDATE_AND_ADD_SECTION(64);
     923                    //VALIDATE_AND_ADD_SECTION(64);
    924924
    925925                    /* next */
    926926                    pSect++;

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette