Commit bedfafe3 authored by Cédric Deltheil's avatar Cédric Deltheil Committed by Daniel Stenberg
Browse files

curl.h: add __ANDROID__ macro check 

When working with the Android Standalone Toolchain the compiler defines
this macro:

  /path/to/arm-linux-androideabi-gcc -E -dM - < /dev/null \
  | grep -i android
  #define __ANDROID__ 1

We really need to check both ANDROID and __ANDROID__ since I've observed
that:

* if you use Android.mk file(s) and the 'ndk-build' script (aka vanilla
way), ANDROID is predefined (see -DANDROID extra C flag),

* if you use the Android Standalone Toolchain, then __ANDROID__ is
predefined as stated by the compiler
parent e9040f29

include/curl/curl.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
   require it! */

#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \

    defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \

    defined(ANDROID) || \

    defined(ANDROID) || defined(__ANDROID__) || \

   (defined(__FreeBSD_version) && (__FreeBSD_version < 800000))

#include <sys/select.h>

#endif