Changeset 164 for trunk/include/helpers/memdebug.h

Timestamp:

May 13, 2002, 7:49:28 AM (23 years ago)

Author:

umoeller

Message:

Massive pager rework.

File:

• trunk/include/helpers/memdebug.h (modified) (3 diffs)

trunk/include/helpers/memdebug.h

@@ -43 +43 @@
 
     #ifndef __stdlib_h           // <stdlib.h>
-        #error stdlib.h must be included before memdebug.h.
+        // #error stdlib.h must be included before memdebug.h.
+        typedef unsigned int size_t;
+    #endif
+
+    #ifndef NULL
+       #if (defined(__EXTENDED__)  || defined( __cplusplus ))
+          #define NULL 0
+       #else
+          #define NULL ((void *)0)
+       #endif
     #endif
 
@@ -146 +155 @@
 
         #ifndef DONT_REPLACE_MALLOC
+
+            #ifdef malloc
+                #undef malloc
+            #endif
             #define malloc(ul) memdMalloc(ul, __FILE__, __LINE__, __FUNCTION__)
+
+            #ifdef calloc
+                #undef calloc
+            #endif
             #define calloc(n, size) memdCalloc(n, size, __FILE__, __LINE__, __FUNCTION__)
+
+            #ifdef realloc
+                #undef realloc
+            #endif
             #define realloc(p, ul) memdRealloc(p, ul, __FILE__, __LINE__, __FUNCTION__)
+
+            #ifdef free
+                #undef free
+            #endif
             #define free(p) memdFree(p, __FILE__, __LINE__, __FUNCTION__)
 
@@ -159 +184 @@
             #endif
 
+            // tell other headers that these have been replaced
             #define __DEBUG_MALLOC_ENABLED__