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.h | |
parent | a1d678444c713218bc18ae7bc7b2f497da512a18 (diff) | |
download | rockbox-d902f94313fe24826cfd2719bb6cc63ae8157a13.tar.gz rockbox-d902f94313fe24826cfd2719bb6cc63ae8157a13.zip |
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.h')
-rw-r--r-- | firmware/malloc/dmalloc.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/firmware/malloc/dmalloc.h b/firmware/malloc/dmalloc.h index a4e0ab4f6b..3314e7e7d3 100644 --- a/firmware/malloc/dmalloc.h +++ b/firmware/malloc/dmalloc.h | |||
@@ -17,15 +17,10 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | void *dmalloc(size_t); | 20 | void *malloc(size_t); |
21 | void dfree(void *); | 21 | void *calloc (size_t nmemb, size_t size); |
22 | void *drealloc(void *, size_t); | 22 | void free(void *); |
23 | 23 | void *realloc(void *, size_t); | |
24 | #define malloc(x) dmalloc(x) | ||
25 | #define free(x) dfree(x) | ||
26 | #define realloc(x,y) drealloc(x,y) | ||
27 | #define calloc(x,y) dcalloc(x,y) | ||
28 | |||
29 | 24 | ||
30 | /* use this to intialize the internals of the dmalloc engine */ | 25 | /* use this to intialize the internals of the dmalloc engine */ |
31 | void dmalloc_initialize(void); | 26 | void dmalloc_initialize(void); |