Change type of constant to avoid a warning.

diff --git a/ChangeLog b/ChangeLog
index f050559d83d9be6edffa8069ad1d0ead49ec7635..fd40eec8c9d9a99ce17e795b9e5f831324a1132d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c
index bac5779530272a5552a597602acf6e224df4e8a2..95c2afda06972035f2b953963ea2e571693b845e 100644 (file)
--- 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.  */