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

    r10383 r21916  
    2929#define PMKBDHK_HOOK_TERM   "_hookKill@0"
    3030
     31#ifdef __cplusplus
     32extern "C" {
     33#endif
    3134
    3235typedef BOOL  (* WIN32API PFN_HOOKINIT)(ULONG hab, char *lpszWindowClass);
    … …  
    3639BOOL WIN32API hookKill(ULONG hab);
    3740
     41#ifdef __cplusplus
     42} // extern "C"
     43#endif
     44
    3845#endif  // __KBDHOOK_H
    3946
Note: See TracChangeset for help on using the changeset viewer.