Fix tst-rfc3484* build failures from USE_NSCD move to config.h.

diff --git a/ChangeLog b/ChangeLog
index 7bc3a242311c6d28b012c497422f6845e4a9cb1d..b54c1405c901ce52f9e9552c4399cef714f8d15f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-23  Roland McGrath  <roland@hack.frob.com>
+
+       * 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@linaro.org>
 
        * elf/elf.h (EF_ARM_ABI_FLOAT_SOFT): New macro.

diff --git a/posix/tst-rfc3484-2.c b/posix/tst-rfc3484-2.c
index 298fe6695ccf062df79f0ef8571b2f407981c995..a37be36e6ad5a27923cc15a7016467b9d114ad17 100644 (file)
--- a/posix/tst-rfc3484-2.c
+++ b/posix/tst-rfc3484-2.c
@@ -53,6 +53,7 @@ _res_hconf_init (void)
 {
 }
 
+#undef USE_NSCD
 #include "../sysdeps/posix/getaddrinfo.c"
 
 service_user *__nss_hosts_database attribute_hidden;

diff --git a/posix/tst-rfc3484-3.c b/posix/tst-rfc3484-3.c
index 701f534bb168e745e82954186e4a706a759928fd..493e76015c74be9e39984a43f9eefaa03b193948 100644 (file)
--- a/posix/tst-rfc3484-3.c
+++ b/posix/tst-rfc3484-3.c
@@ -53,6 +53,7 @@ _res_hconf_init (void)
 {
 }
 
+#undef USE_NSCD
 #include "../sysdeps/posix/getaddrinfo.c"
 
 service_user *__nss_hosts_database attribute_hidden;

diff --git a/posix/tst-rfc3484.c b/posix/tst-rfc3484.c
index f77dc4c2cb719846a45e7cc2cd3a4a0588cda21a..29e1461e1181f2d49c29bcf8934cef8244d7230b 100644 (file)
--- a/posix/tst-rfc3484.c
+++ b/posix/tst-rfc3484.c
@@ -53,6 +53,7 @@ _res_hconf_init (void)
 {
 }
 
+#undef USE_NSCD
 #include "../sysdeps/posix/getaddrinfo.c"
 
 service_user *__nss_hosts_database attribute_hidden;