Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/tools/common/kFileInterfaces.cpp

    r8003 r21916  
    1919*   Header Files                                                               *
    2020*******************************************************************************/
     21#include <malloc.h>
     22
    2123#include "kTypes.h"
    2224#include "kError.h"
    … …  
    6365     * Save the target we are searching for references to.
    6466     */
    65     PXREFSTATE  pState = new XREFSTATE;
     67    PXREFSTATE  pState = (PXREFSTATE)malloc(sizeof(XREFSTATE));
    6668    pState->ulSegment = ulSegment;
    6769    pState->offSegment = offSegment;
    … …  
    131133    kASSERT(preloc != NULL);
    132134    relocFindClose(preloc);
    133     delete preloc->pv2;
     135    free(preloc->pv2);
    134136    preloc->pv2 = NULL;
    135137}
Note: See TracChangeset for help on using the changeset viewer.