Permalink
Browse files

Check for __ANDROID__ in addition to ANDROID macro.

  • Loading branch information...
1 parent 995fa14 commit 7d3f34115657eaf47a21b1a42d515fd2f9776227 @gknauf gknauf committed Apr 16, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 ares.h
  2. +1 −1 ares_setup.h
View
2 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__))
View
@@ -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

0 comments on commit 7d3f341

Please sign in to comment.