aboutsummaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2014-03-31 15:00:32 +0100
committerWill Newton <will.newton@linaro.org>2014-04-11 09:54:18 +0100
commit439bda3209b768c349b98b8ceecf0fa8d94600e9 (patch)
treeb0db463e0025778f6368795e559f955f7da6fcdd /malloc
parent6a5d6ea128153f5a00d8c80f15f76004006767da (diff)
downloadglibc-439bda3209b768c349b98b8ceecf0fa8d94600e9.tar
glibc-439bda3209b768c349b98b8ceecf0fa8d94600e9.tar.gz
glibc-439bda3209b768c349b98b8ceecf0fa8d94600e9.tar.bz2
glibc-439bda3209b768c349b98b8ceecf0fa8d94600e9.zip
malloc: Fix MALLOC_DEBUG -Wundef warning
MALLOC_DEBUG is set optionally on the command line. Default the value to zero if it is not set on the command line, and test its value with #if rather than #ifdef. Verified the code is identical before and after this change apart from line numbers. ChangeLog: 2014-04-11 Will Newton <will.newton@linaro.org> * malloc/malloc.c [!MALLOC_DEBUG]: #define MALLOC_DEBUG to zero if it is not defined elsewhere. (mtrim): Test the value of MALLOC_DEBUG with #if rather than #ifdef.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 9a45707ee7..1120d4df84 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -270,6 +270,10 @@
or other mallocs available that do this.
*/
+#ifndef MALLOC_DEBUG
+#define MALLOC_DEBUG 0
+#endif
+
#ifdef NDEBUG
# define assert(expr) ((void) 0)
#else
@@ -4477,7 +4481,7 @@ mtrim (mstate av, size_t pad)
if (size > psm1)
{
-#ifdef MALLOC_DEBUG
+#if MALLOC_DEBUG
/* When debugging we simulate destroying the memory
content. */
memset (paligned_mem, 0x89, size & ~psm1);