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

    r21301 r21916  
    1818
    1919#ifdef DEBUG
    20     void * _System _debug_smalloc(int size, char *pszFile, int linenr);
    21     void * _System _debug_smallocfill(int size, int filler, char *pszFile, int linenr);
    22     void   _System _debug_sfree(void *chunk, char *pszFile, int linenr);
     20    void * _System _debug_smalloc(int size, const char *pszFile, int linenr);
     21    void * _System _debug_smallocfill(int size, int filler, const char *pszFile, int linenr);
     22    void   _System _debug_sfree(void *chunk, const char *pszFile, int linenr);
    2323
    2424    #define _smalloc(a)         _debug_smalloc((a),__FILE__,__LINE__)
Note: See TracChangeset for help on using the changeset viewer.