diff options
| author | Will Newton <will.newton@linaro.org> | 2014-03-31 15:00:32 +0100 |
|---|---|---|
| committer | Will Newton <will.newton@linaro.org> | 2014-04-11 09:54:18 +0100 |
| commit | 439bda3209b768c349b98b8ceecf0fa8d94600e9 (patch) | |
| tree | b0db463e0025778f6368795e559f955f7da6fcdd | |
| parent | 6a5d6ea128153f5a00d8c80f15f76004006767da (diff) | |
| download | glibc-439bda3209b768c349b98b8ceecf0fa8d94600e9.tar.gz glibc-439bda3209b768c349b98b8ceecf0fa8d94600e9.tar.xz 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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/malloc.c | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index fb0177d554..e7e358385b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +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. + 2014-04-10 Torvald Riegel <triegel@redhat.com> * benchtests/pthread_once-inputs: New file. 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); |