DEBUG => DEBUG_MALLOC, the symbol is already in use!

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@596 a1c6a512-1295-4272-9138-f99709370657

6 files changed, 14 insertions, 19 deletions

diff --git a/firmware/malloc/Makefile b/firmware/malloc/Makefile
index d4c6436184..4524d0630b 100644
--- a/firmware/malloc/Makefile
+++ b/firmware/malloc/Makefile
@@ -21,7 +21,7 @@ LIBOBJS = dmalloc.o bmalloc.o bysize.o
 
 # define this to talk a lot in runtime
 # -DDEBUG_VERBOSE 
-CFLAGS = -g -Wall -DDEBUG
+CFLAGS = -g -W -Wall -DDEBUG_MALLOC
 CC = gcc
 AR = ar
 
diff --git a/firmware/malloc/bmalloc.c b/firmware/malloc/bmalloc.c
index a26c5c68a0..470ee49840 100644
--- a/firmware/malloc/bmalloc.c
+++ b/firmware/malloc/bmalloc.c
@@ -38,7 +38,7 @@
 #define FALSE 0
 #endif
 
-/* #define DEBUG */
+/* #define DEBUG_MALLOC */
 
 #define BMEM_ALIGN 64 /* resolution */ 
 
@@ -240,7 +240,7 @@ static void bmalloc_failed(size_t size)
 
 void bmalloc_status(void)
 {
-#ifdef DEBUG
+#ifdef DEBUG_MALLOC
   struct BlockInfo *block = blockHead;
   long mem_free = 0;
   long mem_used = 0;
diff --git a/firmware/malloc/bysize.c b/firmware/malloc/bysize.c
index c8e2759cec..437159579c 100644
--- a/firmware/malloc/bysize.c
+++ b/firmware/malloc/bysize.c
@@ -388,7 +388,7 @@ Tree *removebyaddr(Tree *t, Tree *remove)
   return x;
 }
 
-#ifdef DEBUG
+#ifdef DEBUG_MALLOC
 static
 int printtree(Tree * t, int d, char output)
 {
@@ -441,7 +441,7 @@ char *bmalloc_obtainbysize( size_t size)
   return (char *)receive;
 }
 
-#ifdef DEBUG
+#ifdef DEBUG_MALLOC
 void bmalloc_print_sizes(void)
 {
   printtree(chunkHead, 0, 1);
diff --git a/firmware/malloc/bysize.h b/firmware/malloc/bysize.h
index c4621328bf..34be8f9021 100644
--- a/firmware/malloc/bysize.h
+++ b/firmware/malloc/bysize.h
@@ -19,6 +19,6 @@
 void bmalloc_remove_chunksize(void *data);
 void bmalloc_insert_bysize(char *data, size_t size);
 char *bmalloc_obtainbysize( size_t size);
-#ifdef DEBUG
+#ifdef DEBUG_MALLOC
 void bmalloc_print_sizes(void);
 #endif
diff --git a/firmware/malloc/dmalloc.c b/firmware/malloc/dmalloc.c
index cf286e54b4..28215563dc 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
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 @@
  *
  ****************************************************************************/
 
-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);