summaryrefslogtreecommitdiff
path: root/ares_setup.h
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2012-04-14 13:30:29 +0200
committerGuenter Knauf <lists@gknw.net>2012-04-14 13:30:29 +0200
commit0d6ef42b5fd717f646b17623d35640871621e448 (patch)
tree0373918909e41f5cbffb6206b16ab86e6b5d4ae5 /ares_setup.h
parent4ef145cede844ba0a690219b36fc585d62863bf8 (diff)
downloadc-ares-0d6ef42b5fd717f646b17623d35640871621e448.tar.gz
c-ares-0d6ef42b5fd717f646b17623d35640871621e448.tar.bz2
c-ares-0d6ef42b5fd717f646b17623d35640871621e448.zip
Fix for Android to disable useless arpa/nameser.h.
Diffstat (limited to 'ares_setup.h')
-rw-r--r--ares_setup.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/ares_setup.h b/ares_setup.h
index 1ef054d..9cd7d2c 100644
--- a/ares_setup.h
+++ b/ares_setup.h
@@ -176,6 +176,14 @@
#endif
/*
+ * Android does have the arpa/nameser.h header which is detected by configure
+ * but it appears to be empty with recent NDK r7b / r7c, so we undefine here.
+ */
+#if defined(__ANDROID__) && defined(HAVE_ARPA_NAMESER_H)
+# undef HAVE_ARPA_NAMESER_H
+#endif
+
+/*
* Recent autoconf versions define these symbols in ares_config.h. We don't
* want them (since they collide with the libcurl ones when we build
* --enable-debug) so we undef them again here.