aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-17 11:17:04 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-17 11:17:04 -0700
commit2ae1ae5cf441a90171ff483e3f0de6e8a9d611e4 (patch)
tree06b8614ae25c38af343a4c43ede0a2d4c4cee6b9
parente66a42f57fd20d1c7bbdc5f7937831d13bcf709b (diff)
downloadglibc-2ae1ae5cf441a90171ff483e3f0de6e8a9d611e4.zip
glibc-2ae1ae5cf441a90171ff483e3f0de6e8a9d611e4.tar.gz
glibc-2ae1ae5cf441a90171ff483e3f0de6e8a9d611e4.tar.bz2
Change type of constant to avoid a warning.
-rw-r--r--ChangeLog5
-rw-r--r--elf/dl-iteratephdr.c4
2 files changed, 7 insertions, 2 deletions
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. */