From: Guenter Knauf <lists@gknw.net>
Date: Mon, 16 Apr 2012 08:19:07 +0000 (+0200)
Subject: Check for __ANDROID__ in addition to ANDROID macro.
X-Git-Tag: upstream/1.10.0~127
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=995fa144d97a80f87b40a1e335eb72a938026d48;p=platform%2Fupstream%2Fc-ares.git

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 ea2a978..0167f56 100644
--- 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);