This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.19-271-g439bda3


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  439bda3209b768c349b98b8ceecf0fa8d94600e9 (commit)
      from  6a5d6ea128153f5a00d8c80f15f76004006767da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=439bda3209b768c349b98b8ceecf0fa8d94600e9

commit 439bda3209b768c349b98b8ceecf0fa8d94600e9
Author: Will Newton <will.newton@linaro.org>
Date:   Mon Mar 31 15:00:32 2014 +0100

    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.

diff --git a/ChangeLog b/ChangeLog
index fb0177d..e7e3583 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 9a45707..1120d4d 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);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    6 ++++++
 malloc/malloc.c |    6 +++++-
 2 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]