diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2002-05-16 14:16:48 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2002-05-16 14:16:48 +0000 |
| commit | d902f94313fe24826cfd2719bb6cc63ae8157a13 (patch) | |
| tree | 51d40901073683b720cb963304074dbe50e71a37 /firmware/malloc/dmalloc.c | |
| parent | a1d678444c713218bc18ae7bc7b2f497da512a18 (diff) | |
| download | rockbox-d902f94313fe24826cfd2719bb6cc63ae8157a13.zip rockbox-d902f94313fe24826cfd2719bb6cc63ae8157a13.tar.gz rockbox-d902f94313fe24826cfd2719bb6cc63ae8157a13.tar.bz2 rockbox-d902f94313fe24826cfd2719bb6cc63ae8157a13.tar.xz | |
DEBUG => DEBUG_MALLOC, the symbol is already in use!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@596 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/malloc/dmalloc.c')
| -rw-r--r-- | firmware/malloc/dmalloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/malloc/dmalloc.c b/firmware/malloc/dmalloc.c index cf286e5..2821556 100644 --- a/firmware/malloc/dmalloc.c +++ b/firmware/malloc/dmalloc.c @@ -29,7 +29,7 @@ #include <stdio.h> #include <string.h> /* memcpy */ -#ifdef DEBUG +#ifdef DEBUG_MALLOC #include <stdarg.h> #endif @@ -106,7 +106,7 @@ struct MemInfo { anyway: */ #ifdef PSOS -#ifdef DEBUG +#ifdef DEBUG_MALLOC #define DMEM_OSALLOCMEM(size,pointer,type) pointer=(type)dbgmalloc(size) #define DMEM_OSFREEMEM(x) dbgfree(x) #else @@ -126,7 +126,7 @@ struct MemInfo { #ifdef BMALLOC /* use our own big-memory-allocation system */ #define DMEM_OSALLOCMEM(size,pointer,type) pointer=(type)bmalloc(size) #define DMEM_OSFREEMEM(x) bfree(x) -#elif DEBUG +#elif DEBUG_MALLOC #define DMEM_OSALLOCMEM(size,pointer,type) pointer=(type)dbgmalloc(size) #define DMEM_OSFREEMEM(x) dbgfree(x) #else @@ -177,7 +177,7 @@ static struct MemTop top[ sizeof(qinfo)/sizeof(qinfo[0]) ]; /* Start of the real code */ /* ---------------------------------------------------------------------- */ -#ifdef DEBUG +#ifdef DEBUG_MALLOC /************ * A few functions that are verbose and tells us about the current status * of the dmalloc system |