Fix for Android to disable useless arpa/nameser.h.

diff --git a/ares_setup.h b/ares_setup.h
index 1ef054dc57a1fcce28949f16d309b934c54b7e1c..9cd7d2c1b06541aec585b838f3b6206069fdbef3 100644 (file)
--- a/ares_setup.h
+++ b/ares_setup.h
@@ -175,6 +175,14 @@
 #  define ESRCH 3
 #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