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

    r21596 r21916  
    1515#endif
    1616
     17#ifdef __cplusplus
     18extern "C" {
     19#endif
     20
    1721typedef PVOID (* PAUXTHREADFN)(PVOID arg1, PVOID arg2, PVOID arg3, PVOID arg4);
    1822
    … …  
    2529VOID StopAuxThread();
    2630
     31#ifdef __cplusplus
     32} // extern "C"
     33#endif
     34
    2735#endif //__AUXTHREAD_H__
Note: See TracChangeset for help on using the changeset viewer.