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/include/winkeyboard.h

    r7314 r21916  
    1010#define __WINKEYBOARD_H__
    1111
     12#ifdef __cplusplus
     13extern "C" {
     14#endif
    1215
    13 
    14 BYTE WIN32API KeyTranslatePMToWin(BYTE key);
    15 void WIN32API KeyTranslatePMToWinBuf(BYTE *pmkey, BYTE *winkey, int nrkeys);
    16 void WIN32API KeyTranslatePMScanToWinVKey(BYTE bPMScan,
     16void WIN32API KeyTranslatePMToWinBuf(PUCHAR pmkey, PUCHAR winkey, int nrkeys);
     17void WIN32API KeyTranslatePMScanToWinVKey(UCHAR uchPMScan,
    1718                                          BOOL bNumLock,
    18                                           PBYTE pbWinVKey,
    19                                           WORD* pwWinScan,
     19                                          PUCHAR puchWinVKey,
     20                                          WORD *pwWinScan,
    2021                                          PBOOL pfExtended);
    21 BYTE WIN32API KeyTranslateWinVKeyToPMScan(BYTE bWinVKey, BOOL fExtended);
    22 BYTE WIN32API KeyTranslateWinScanToPMScan(BYTE bWinScan, BOOL fExtended);
     22UCHAR WIN32API KeyTranslateWinVKeyToPMScan(UCHAR uchWinVKey, BOOL fExtended);
     23UCHAR WIN32API KeyTranslateWinScanToPMScan(UCHAR uchWinScan, BOOL fExtended);
    2324
    2425#define KEYOVERLAYSTATE_DONTCARE 0
    … …  
    2930                                    char nState);
    3031
     32#ifdef __cplusplus
     33} // extern "C"
     34#endif
    3135
    3236#endif //__WINKEYBOARD_H__
Note: See TracChangeset for help on using the changeset viewer.