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

    r21381 r21916  
    2929#define ODIN_GetCurrentThreadId()    MAKE_THREADID(fibGetPid(), fibGetTid())
    3030#define ODIN_GetCurrentProcessId()   fibGetPid()
     31
     32#ifdef __cplusplus
     33extern "C" {
     34#endif
    3135
    3236TEB   *WIN32API CreateTEB(HANDLE hThread, DWORD dwThreadId);
    … …  
    8488UINT WIN32API GetProcModuleFileNameA(ULONG lpvAddress, LPSTR lpszFileName, UINT cchFileNameMax);
    8589
     90#ifdef __cplusplus
     91} // extern "C"
    8692#endif
     93
     94#endif
Note: See TracChangeset for help on using the changeset viewer.