summaryrefslogtreecommitdiff
path: root/firmware/malloc/dmalloc.h
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2002-05-16 14:16:48 +0000
committerDaniel Stenberg <daniel@haxx.se>2002-05-16 14:16:48 +0000
commitd902f94313fe24826cfd2719bb6cc63ae8157a13 (patch)
tree51d40901073683b720cb963304074dbe50e71a37 /firmware/malloc/dmalloc.h
parenta1d678444c713218bc18ae7bc7b2f497da512a18 (diff)
downloadrockbox-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.h')
-rw-r--r--firmware/malloc/dmalloc.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/firmware/malloc/dmalloc.h b/firmware/malloc/dmalloc.h
index a4e0ab4..3314e7e 100644
--- a/firmware/malloc/dmalloc.h
+++ b/firmware/malloc/dmalloc.h
@@ -17,15 +17,10 @@
*
****************************************************************************/
-void *dmalloc(size_t);
-void dfree(void *);
-void *drealloc(void *, size_t);
-
-#define malloc(x) dmalloc(x)
-#define free(x) dfree(x)
-#define realloc(x,y) drealloc(x,y)
-#define calloc(x,y) dcalloc(x,y)
-
+void *malloc(size_t);
+void *calloc (size_t nmemb, size_t size);
+void free(void *);
+void *realloc(void *, size_t);
/* use this to intialize the internals of the dmalloc engine */
void dmalloc_initialize(void);