[Commits] r20328 - in /fsf/trunk/libc: ChangeLog posix/tst-rfc3484-2.c posix/tst-rfc3484-3.c posix/tst-rfc3484.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Aug 25 00:01:48 2012
New Revision: 20328

Log:
Import glibc-mainline for 2012-08-25

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/posix/tst-rfc3484-2.c
    fsf/trunk/libc/posix/tst-rfc3484-3.c
    fsf/trunk/libc/posix/tst-rfc3484.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Aug 25 00:01:48 2012
@@ -1,3 +1,9 @@
+2012-08-23  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* posix/tst-rfc3484.c: #undef USE_NSCD before including getaddrinfo.c.
+	* posix/tst-rfc3484-2.c: Likewise.
+	* posix/tst-rfc3484-3.c: Likewise.
+
 2012-08-23  Steve McIntyre  <steve.mcintyre@xxxxxxxxxx>
 
 	* elf/elf.h (EF_ARM_ABI_FLOAT_SOFT): New macro.

Modified: fsf/trunk/libc/posix/tst-rfc3484-2.c
==============================================================================
--- fsf/trunk/libc/posix/tst-rfc3484-2.c (original)
+++ fsf/trunk/libc/posix/tst-rfc3484-2.c Sat Aug 25 00:01:48 2012
@@ -53,6 +53,7 @@
 {
 }
 
+#undef	USE_NSCD
 #include "../sysdeps/posix/getaddrinfo.c"
 
 service_user *__nss_hosts_database attribute_hidden;

Modified: fsf/trunk/libc/posix/tst-rfc3484-3.c
==============================================================================
--- fsf/trunk/libc/posix/tst-rfc3484-3.c (original)
+++ fsf/trunk/libc/posix/tst-rfc3484-3.c Sat Aug 25 00:01:48 2012
@@ -53,6 +53,7 @@
 {
 }
 
+#undef	USE_NSCD
 #include "../sysdeps/posix/getaddrinfo.c"
 
 service_user *__nss_hosts_database attribute_hidden;

Modified: fsf/trunk/libc/posix/tst-rfc3484.c
==============================================================================
--- fsf/trunk/libc/posix/tst-rfc3484.c (original)
+++ fsf/trunk/libc/posix/tst-rfc3484.c Sat Aug 25 00:01:48 2012
@@ -53,6 +53,7 @@
 {
 }
 
+#undef	USE_NSCD
 #include "../sysdeps/posix/getaddrinfo.c"
 
 service_user *__nss_hosts_database attribute_hidden;

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits