Changeset 9709 for trunk/src/odincrt/malloc.cpp

Timestamp:

Jan 22, 2003, 6:06:44 PM (23 years ago)

Author:

sandervl

Message:

Changed wrapper names

File:

• trunk/src/odincrt/malloc.cpp (modified) (14 diffs)

trunk/src/odincrt/malloc.cpp

@@ -1 @@
-/* $Id: malloc.cpp,v 1.7 2002-09-19 09:38:26 sandervl Exp $ */
+/* $Id: malloc.cpp,v 1.8 2003-01-22 17:06:42 sandervl Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -8 +8 @@
  */
 
-//#undef __DEBUG_ALLOC__
+#define ORIGINAL_VAC_FUNCTIONS
 #include <malloc.h>
 #include <umalloc.h>
@@ -48 +48 @@
 #endif
 
-void * _LNK_CONV os2calloc( size_t a, size_t b )
+void * _LNK_CONV CRTWRAP(calloc)( size_t a, size_t b )
 {
     unsigned short sel = RestoreOS2FS();
@@ -62 +62 @@
 }
 
-void   _LNK_CONV os2free( void *a )
+void   _LNK_CONV CRTWRAP(free)( void *a )
 {
     unsigned short sel = RestoreOS2FS();
@@ -74 +74 @@
 }
 
-void * _LNK_CONV os2malloc( size_t a)
+void * _LNK_CONV CRTWRAP(malloc)( size_t a)
 {
     unsigned short sel = RestoreOS2FS();
@@ -89 +89 @@
 }
 
-void * _LNK_CONV os2realloc( void *a, size_t b)
+void * _LNK_CONV CRTWRAP(realloc)( void *a, size_t b)
 {
     unsigned short sel = RestoreOS2FS();
@@ -103 +103 @@
 }
 
-void * _LNK_CONV os2_debug_calloc( size_t a, size_t b, const char *c, size_t d)
+void * _LNK_CONV CRTWRAP(_debug_calloc)( size_t a, size_t b, const char *c, size_t d)
 {
     unsigned short sel = RestoreOS2FS();
@@ -118 +118 @@
 }
 
-void   _LNK_CONV os2_debug_free( void *a, const char *b, size_t c)
+void   _LNK_CONV CRTWRAP(_debug_free)( void *a, const char *b, size_t c)
 {
     unsigned short sel = RestoreOS2FS();
@@ -131 +131 @@
 }
 
-void * _LNK_CONV os2_debug_malloc( size_t a, const char *b, size_t c)
+void * _LNK_CONV CRTWRAP(_debug_malloc)( size_t a, const char *b, size_t c)
 {
     unsigned short sel = RestoreOS2FS();
@@ -145 +145 @@
 }
 
-void * _LNK_CONV os2_debug_realloc( void *a, size_t b, const char *c, size_t d)
+void * _LNK_CONV CRTWRAP(_debug_realloc)( void *a, size_t b, const char *c, size_t d)
 {
     unsigned short sel = RestoreOS2FS();
@@ -158 +158 @@
 }
 
-void * _LNK_CONV os2_umalloc(Heap_t a, size_t b)
+void * _LNK_CONV CRTWRAP(_umalloc)(Heap_t a, size_t b)
 {
     unsigned short sel = RestoreOS2FS();
@@ -172 +172 @@
 }
 
-void * _LNK_CONV os2_ucalloc(Heap_t a, size_t b, size_t c)
+void * _LNK_CONV CRTWRAP(_ucalloc)(Heap_t a, size_t b, size_t c)
 {
     unsigned short sel = RestoreOS2FS();
@@ -186 +186 @@
 }
 
-void * _LNK_CONV os2_debug_umalloc(Heap_t a, size_t b, const char *c, size_t d)
+void * _LNK_CONV CRTWRAP(_debug_umalloc)(Heap_t a, size_t b, const char *c, size_t d)
 {
     unsigned short sel = RestoreOS2FS();
@@ -200 +200 @@
 }
 
-void * _LNK_CONV os2_debug_ucalloc(Heap_t a, size_t b, size_t c, const char *d, size_t e)
+void * _LNK_CONV CRTWRAP(_debug_ucalloc)(Heap_t a, size_t b, size_t c, const char *d, size_t e)
 {
     unsigned short sel = RestoreOS2FS();