Changeset 21826 for branches


Ignore:
Timestamp:
Nov 29, 2011, 10:49:58 AM (14 years ago)
Author:
dmik
Message:

Don't use _Optlink for _LNK_CONV under GCC.

_LNK_CONV is mainly used for ucreate() callbacks which are
cdecl in GCC.

Location:
branches/gcc-kmk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/gcc-kmk/include/odin.h

    r21804 r21826  
    9393  #ifdef __INNOTEK_LIBC__
    9494  #define SYSTEM    _System
    95   #define _LNK_CONV _Optlink
     95  #define _LNK_CONV
    9696  #else
    9797  #define SYSTEM    CDECL

  • branches/gcc-kmk/include/stats.h

    r21802 r21826  
    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);
    1010#ifdef __cplusplus
    1111extern "C" {

  • branches/gcc-kmk/src/odincrt/malloc.cpp

    r21823 r21826  
    1616
    1717// currently, it's a dumb stub
    18 void _LNK_CONV getcrtstat(unsigned long *pnrcalls_malloc,
    19                           unsigned long *pnrcalls_free,
    20                           unsigned long *ptotalmemalloc)
     18void SYSTEM getcrtstat(unsigned long *pnrcalls_malloc,
     19                       unsigned long *pnrcalls_free,
     20                       unsigned long *ptotalmemalloc)
    2121{
    2222    *pnrcalls_malloc = nrcalls_malloc;

  • branches/gcc-kmk/src/odincrt/malloc_vac.cpp

    r21794 r21826  
    2525unsigned long totalmemalloc  = 0;
    2626
    27 void _LNK_CONV getcrtstat(unsigned long *pnrcalls_malloc,
    28                           unsigned long *pnrcalls_free,
    29                           unsigned long *ptotalmemalloc)
     27void SYSTEM getcrtstat(unsigned long *pnrcalls_malloc,
     28                       unsigned long *pnrcalls_free,
     29                       unsigned long *ptotalmemalloc)
    3030{
    3131    *pnrcalls_malloc = nrcalls_malloc;
Note: See TracChangeset for help on using the changeset viewer.