From 7d3f34115657eaf47a21b1a42d515fd2f9776227 Mon Sep 17 00:00:00 2001
From: Guenter Knauf <lists@gknw.net>
Date: Mon, 16 Apr 2012 10:34:05 +0200
Subject: [PATCH] Check for __ANDROID__ in addition to ANDROID macro.

---
 ares.h       | 2 +-
 ares_setup.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ares.h b/ares.h
index 9702edf1..a4a119e1 100644
--- a/ares.h
+++ b/ares.h
@@ -38,7 +38,7 @@
    require it! */
 #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
     defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
-    defined(__ANDROID__)
+    defined(ANDROID) || defined(__ANDROID__)
 #include <sys/select.h>
 #endif
 #if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
diff --git a/ares_setup.h b/ares_setup.h
index 9cd7d2c1..4df79611 100644
--- a/ares_setup.h
+++ b/ares_setup.h
@@ -179,7 +179,7 @@
  * 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)
+#if (defined(ANDROID) || defined(__ANDROID__)) && defined(HAVE_ARPA_NAMESER_H)
 #  undef HAVE_ARPA_NAMESER_H
 #endif