The debugging memory allocator is now enabled by DEBUG_DMALLOC instead

of just "DMALLOC".

diff --git a/lib/alloc.c b/lib/alloc.c
index 40f3edf3171379ab42ba68461e8ab13781454649..21d9635778daf3974132f1fc6f13df82523f78a4 100644 (file)
--- a/lib/alloc.c
+++ b/lib/alloc.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef DMALLOC
+#ifndef DEBUG_DMALLOC
 
 void *
 xmalloc(uns size)

diff --git a/lib/lib.h b/lib/lib.h
index a7cf04170a071c9c4d5df8fb4498480f6f7fe4ee..518ce1956de19c52083c5b8f4c4c72914b7e9f57 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -71,7 +71,7 @@ void assert_failed(void) NONRET;
 
 /* Memory allocation */
 
-#ifdef DMALLOC
+#ifdef DEBUG_DMALLOC
 /*
  * The standard dmalloc macros tend to produce lots of namespace
  * conflicts and we use only xmalloc and xfree, so we can define

diff --git a/lib/realloc.c b/lib/realloc.c
index 150a3d7bc5593d61d655349a0294a4e3cb3ebe52..536f61f9acce4714b53e9a43e6222b6e35ac67d0 100644 (file)
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -11,7 +11,7 @@
 
 #include <stdlib.h>
 
-#ifndef DMALLOC
+#ifndef DEBUG_DMALLOC
 
 void *
 xrealloc(void *old, uns size)