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

    r21301 r21916  
    55
    66//Get memory statistics from odincrt
    7 void _LNK_CONV getcrtstat(unsigned long *pnrcalls_malloc,
    8                           unsigned long *pnrcalls_free,
    9                           unsigned long *ptotalmemalloc);
     7void SYSTEM getcrtstat(unsigned long *pnrcalls_malloc,
     8                       unsigned long *pnrcalls_free,
     9                       unsigned long *ptotalmemalloc);
     10#ifdef __cplusplus
     11extern "C" {
     12#endif
    1013
    1114#ifdef OS2_INCLUDED
    … …  
    99102#endif
    100103
     104#ifdef __cplusplus
     105} // extern "C"
    101106#endif
     107
     108#endif
Note: See TracChangeset for help on using the changeset viewer.