From: Roland McGrath Date: Fri, 17 Aug 2012 18:17:04 +0000 (-0700) Subject: Change type of constant to avoid a warning. X-Git-Tag: upstream/2.16.90~663 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ae1ae5cf441a90171ff483e3f0de6e8a9d611e4;p=platform%2Fupstream%2Fglibc.git 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 + * elf/dl-iteratephdr.c (__dl_iterate_phdr): Use NULL rather than 0 for + __libc_cleanup_push argument. + +2012-08-17 Roland McGrath + * 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 , 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. */