This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-215-g2ae1ae5
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Aug 2012 18:18:15 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-215-g2ae1ae5
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 2ae1ae5cf441a90171ff483e3f0de6e8a9d611e4 (commit)
from e66a42f57fd20d1c7bbdc5f7937831d13bcf709b (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2ae1ae5cf441a90171ff483e3f0de6e8a9d611e4
commit 2ae1ae5cf441a90171ff483e3f0de6e8a9d611e4
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Aug 17 11:17:04 2012 -0700
Change type of constant to avoid a warning.
diff --git a/ChangeLog b/ChangeLog
index f050559..fd40eec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-08-17 Roland McGrath <roland@hack.frob.com>
+ * elf/dl-iteratephdr.c (__dl_iterate_phdr): Use NULL rather than 0 for
+ __libc_cleanup_push argument.
+
+2012-08-17 Roland McGrath <roland@hack.frob.com>
+
* bits/param.h: New file.
* misc/sys/param.h: New file.
* include/sys/param.h: New file.
diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c
index bac5779..95c2afd 100644
--- a/elf/dl-iteratephdr.c
+++ b/elf/dl-iteratephdr.c
@@ -1,5 +1,5 @@
/* Get loaded objects program headers.
- Copyright (C) 2001-2004, 2006-2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2001.
@@ -39,7 +39,7 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
/* Make sure nobody modifies the list of loaded objects. */
__rtld_lock_lock_recursive (GL(dl_load_write_lock));
- __libc_cleanup_push (cancel_handler, 0);
+ __libc_cleanup_push (cancel_handler, NULL);
/* We have to determine the namespace of the caller since this determines
which namespace is reported. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
elf/dl-iteratephdr.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources