[commits] r10415 - in /fsf/trunk/libc: ChangeLog elf/ldconfig.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat May  8 00:03:32 2010
New Revision: 10415

Log:
Import glibc-mainline for 2010-05-08

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/ldconfig.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat May  8 00:03:32 2010
@@ -1,3 +1,7 @@
+2010-05-07  Roland McGrath  <roland@xxxxxxxxxx>
+
+	* elf/ldconfig.c (main): Add a const.
+
 2010-05-06  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* nss/getent.c (idn_flags): Default to AI_IDN|AI_CANONIDN.

Modified: fsf/trunk/libc/elf/ldconfig.c
==============================================================================
--- fsf/trunk/libc/elf/ldconfig.c (original)
+++ fsf/trunk/libc/elf/ldconfig.c Sat May  8 00:03:32 2010
@@ -1357,7 +1357,7 @@
 	add_system_dir (LIBDIR);
     }
 
-  char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
+  const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
   if (opt_chroot)
     {
       aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);