summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-23 16:55:40 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-23 16:55:40 -0700
commit59a629f121326093a3e7321e2ca66eb01921872f (patch)
treeebaf6d7c74a532f34a5fad27a4a04ba0fc84cca5
parentd3bafbc98e91e97b67b5402ec5f87eef7edfd64b (diff)
downloadglibc-59a629f121326093a3e7321e2ca66eb01921872f.tar.gz
Fix tst-rfc3484* build failures from USE_NSCD move to config.h.
-rw-r--r--ChangeLog6
-rw-r--r--posix/tst-rfc3484-2.c1
-rw-r--r--posix/tst-rfc3484-3.c1
-rw-r--r--posix/tst-rfc3484.c1
4 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7bc3a24231..b54c1405c9 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 298fe6695c..a37be36e6a 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 701f534bb1..493e76015c 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 f77dc4c2cb..29e1461e11 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;