[commits] r14446 - in /fsf/trunk/libc: ChangeLog config.make.in nscd/nscd_getserv_r.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jul  6 00:02:33 2011
New Revision: 14446

Log:
Import glibc-mainline for 2011-07-06

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/config.make.in
    fsf/trunk/libc/nscd/nscd_getserv_r.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jul  6 00:02:33 2011
@@ -1,3 +1,11 @@
+2011-07-05  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* config.make.in (install_root): Default to $(DESTDIR).
+
+2011-07-05  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* nscd/nscd_getserv_r.c (nscd_getserv_r): Add cast to avoid warning.
+
 2011-07-02  Roland McGrath  <roland@xxxxxxxxxxxxx>
 
 	* Makerules ($(common-objpfx)format.lds): Fail if result is empty.

Modified: fsf/trunk/libc/config.make.in
==============================================================================
--- fsf/trunk/libc/config.make.in (original)
+++ fsf/trunk/libc/config.make.in Wed Jul  6 00:02:33 2011
@@ -5,7 +5,7 @@
 release = @RELEASE@
 
 # Installation prefixes.
-install_root =
+install_root = $(DESTDIR)
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@

Modified: fsf/trunk/libc/nscd/nscd_getserv_r.c
==============================================================================
--- fsf/trunk/libc/nscd/nscd_getserv_r.c (original)
+++ fsf/trunk/libc/nscd/nscd_getserv_r.c Wed Jul  6 00:02:33 2011
@@ -374,7 +374,7 @@
       if (retval != -1)
 	{
 	  if (!alloca_aliases_len)
-	    free (aliases_len);
+	    free ((void *) aliases_len);
 	  goto retry;
 	}
     }