Check for __ANDROID__ in addition to ANDROID macro.

Posted to c-ares list by Wayne.

diff --git a/ares_init.c b/ares_init.c
index ea2a9780fd5d75a6465bdfa7a5d1d1488b31e2e3..0167f569b226e8dd4343bc22a750e101b4fd6156 100644 (file)
--- a/ares_init.c
+++ b/ares_init.c
@@ -60,7 +60,7 @@
 #include <ctype.h>
 #include <time.h>
 
-#ifdef ANDROID
+#elif defined(ANDROID) || defined(__ANDROID__)
 #include <sys/system_properties.h>
 #endif
 
@@ -971,7 +971,7 @@ DhcpNameServer
   }
   status = ARES_EOF;
 
-#elif defined(ANDROID)
+#elif defined(ANDROID) || defined(__ANDROID__)
   char value[PROP_VALUE_MAX]="";
   __system_property_get("net.dns1", value);
   status = config_nameserver(&servers, &nservers, value);