Chiebot-Mirror
/
c-ares
mirror of https://github.com/c-ares/c-ares.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Check for __ANDROID__ in addition to ANDROID macro.

Browse Source
pull/8/merge
Guenter Knauf 13 years ago
parent 995fa144d9
commit 7d3f341156
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ares.h
  2. 2
      ares_setup.h

2
ares.h
Unescape View File

@ -38,7 +38,7 @@
require it! */ require it! */
#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \ #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \ defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
defined(__ANDROID__) defined(ANDROID) || defined(__ANDROID__)
#include <sys/select.h> #include <sys/select.h>
#endif #endif
#if (defined(NETWARE) && !defined(__NOVELL_LIBC__)) #if (defined(NETWARE) && !defined(__NOVELL_LIBC__))

2
ares_setup.h
Unescape View File

@ -179,7 +179,7 @@
* Android does have the arpa/nameser.h header which is detected by configure * 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. * 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 # undef HAVE_ARPA_NAMESER_H
#endif #endif

Write Preview
Loading…
Cancel
Save