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/hmdevice.h

    r21302 r21916  
    446446
    447447
     448#ifdef __cplusplus
     449extern "C" {
     450#endif
     451
    448452/*****************************************************************************
    449453 * Prototypes                                                                *
    … …  
    451455
    452456                            /* register a new device with the handle manager */
    453 DWORD  HMDeviceRegister(LPSTR           pszDeviceName,
     457DWORD  HMDeviceRegister(LPCSTR           pszDeviceName,
    454458                        HMDeviceHandler *pDeviceHandler);
    455459
    456 DWORD  HMDeviceRegisterEx(LPSTR           pszDeviceName,
     460DWORD  HMDeviceRegisterEx(LPCSTR           pszDeviceName,
    457461                          HMDeviceHandler *pDeviceHandler,
    458462                          VOID            *pDevData);
    459463
     464#ifdef __cplusplus
     465} // extern "C"
     466#endif
    460467
    461468#include "hmhandle.h"
Note: See TracChangeset for help on using the changeset viewer.