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.18-425-g070906f


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  070906ffd305b9c439d6d04af26e1ecae2394fe8 (commit)
      from  6851bd4d97546fc7378864d36f42f9d2df15dac5 (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=070906ffd305b9c439d6d04af26e1ecae2394fe8

commit 070906ffd305b9c439d6d04af26e1ecae2394fe8
Author: Roland McGrath <roland@hack.frob.com>
Date:   Thu Nov 21 15:49:50 2013 -0800

    Add missing #include for malloc/hooks.c code.

diff --git a/ChangeLog b/ChangeLog
index ee88097..b9201fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-11-21  Roland McGrath  <roland@hack.frob.com>
 
+	* malloc/malloc.c: Move #include <sys/param.h> to the top; comment why
+	it's there.
+
 	* sysdeps/generic/sys/swap.h (swapon): Add FLAGS argument to prototype.
 
 2013-11-21  Meador Inge  <meadori@codesourcery.com>
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 0181717..c8a5374 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -238,6 +238,9 @@
 /* For va_arg, va_start, va_end.  */
 #include <stdarg.h>
 
+/* For MIN, MAX, powerof2.  */
+#include <sys/param.h>
+
 
 /*
   Debugging:
@@ -4875,8 +4878,6 @@ malloc_printerr(int action, const char *str, void *ptr)
     abort ();
 }
 
-#include <sys/param.h>
-
 /* We need a wrapper function for one of the additions of POSIX.  */
 int
 __posix_memalign (void **memptr, size_t alignment, size_t size)

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

Summary of changes:
 ChangeLog       |    3 +++
 malloc/malloc.c |    5 +++--
 2 files changed, 6 insertions(+), 2 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]