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

    r21301 r21916  
    2828#endif
    2929
     30#ifdef __cplusplus
     31extern "C" {
     32#endif
     33
    3034/**
    3135 * Gets the type of an object.
    … …  
    3741unsigned WIN32API HMQueryObjectType(HANDLE hObject);
    3842
     43#ifdef __cplusplus
     44} // extern "C"
     45#endif
     46
    3947/** @} */
    4048
Note: See TracChangeset for help on using the changeset viewer.