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/src/kernel32/hmcomm.cpp

    r21302 r21916  
    233233        {
    234234            OSLibDosClose(pHMHandleData->hHMHandle);
    235             delete pHMHandleData->lpHandlerData;
     235            delete (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
    236236            return rc;
    237237        }
    … …  
    274274fail:
    275275
    276     delete pHMHandleData->lpHandlerData;
     276    delete (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
    277277    OSLibDosClose(pHMHandleData->hHMHandle);
    278278    return ret;
    … …  
    300300BOOL HMDeviceCommClass::CloseHandle(PHMHANDLEDATA pHMHandleData)
    301301{
    302     PHMDEVCOMDATA pDevData = (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
    303302    dprintf(("HMComm: Serial communication port close request"));
    304303
    305     delete pHMHandleData->lpHandlerData;
     304    delete (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
    306305    return OSLibDosClose(pHMHandleData->hHMHandle);
    307306}
Note: See TracChangeset for help on using the changeset viewer.