From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 23 Aug 2012 23:55:40 +0000 (-0700)
Subject: Fix tst-rfc3484* build failures from USE_NSCD move to config.h.
X-Git-Tag: glibc-2.17~621
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59a629f121326093a3e7321e2ca66eb01921872f;p=thirdparty%2Fglibc.git

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

diff --git a/ChangeLog b/ChangeLog
index 7bc3a242311..b54c1405c90 100644
--- 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 298fe6695cc..a37be36e6ad 100644
--- 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 701f534bb16..493e76015c7 100644
--- 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 f77dc4c2cb7..29e1461e118 100644
--- 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;