diff options
| author | CeĢdric Deltheil <cedric@moodstocks.com> | 2011-12-20 12:23:11 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-12-20 20:18:14 +0100 |
| commit | bedfafe38e93677a72e9cd52fa60c4bc72bc5e01 (patch) | |
| tree | ad0ecf8ff6cf1a76b231ca7579b5b1e54712bc6e /include/curl | |
| parent | e9040f2954bc1423a4b2e47883294dce088a12d5 (diff) | |
| download | curl-bedfafe38e93677a72e9cd52fa60c4bc72bc5e01.tar.gz | |
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
Diffstat (limited to 'include/curl')
| -rw-r--r-- | include/curl/curl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index 8f823486a..1e908a3ec 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -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 |