From bedfafe38e93677a72e9cd52fa60c4bc72bc5e01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ce=CC=81dric=20Deltheil?= Date: Tue, 20 Dec 2011 12:23:11 +0100 Subject: [PATCH] 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 --- include/curl/curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 #endif -- 2.50.1