Changeset 21826 for branches/gcc-kmk/src

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/src/odincrt

Files:

• malloc.cpp (modified) (1 diff)
• malloc_vac.cpp (modified) (1 diff)

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

@@ -16 +16 @@
 
 // currently, it's a dumb stub
-void _LNK_CONV getcrtstat(unsigned long *pnrcalls_malloc,
-                          unsigned long *pnrcalls_free,
-                          unsigned long *ptotalmemalloc)
+void SYSTEM getcrtstat(unsigned long *pnrcalls_malloc,
+                       unsigned long *pnrcalls_free,
+                       unsigned long *ptotalmemalloc)
 {
     *pnrcalls_malloc = nrcalls_malloc;

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

@@ -25 +25 @@
 unsigned long totalmemalloc  = 0;
 
-void _LNK_CONV getcrtstat(unsigned long *pnrcalls_malloc,
-                          unsigned long *pnrcalls_free,
-                          unsigned long *ptotalmemalloc)
+void SYSTEM getcrtstat(unsigned long *pnrcalls_malloc,
+                       unsigned long *pnrcalls_free,
+                       unsigned long *ptotalmemalloc)
 {
     *pnrcalls_malloc = nrcalls_malloc;