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/src/kernel32/profile.h

    r10528 r21916  
    1414#define ODINININAME "ODIN.INI"
    1515
    16 void WINAPI WriteOutProfiles(void);
     16#ifdef __cplusplus
     17extern "C" {
     18#endif
     19
    1720int WINAPI PROFILE_Initialize (void);
    18 int WINAPI PROFILE_LoadOdinIni(void);
    1921
    2022#ifdef DEBUG
    … …  
    4547#endif
    4648
    47 #include <win\options.h> //for odin profile apis
     49#ifdef __cplusplus
     50} // extern "C"
     51#endif
     52
     53#include <win/options.h> //for odin profile apis
    4854
    4955#endif
Note: See TracChangeset for help on using the changeset viewer.