From 391ea5d06be85a8fa4254d0cc2ffe0b1049907bb Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 11 Mar 2013 14:08:11 +0000
Subject: [PATCH] Check for __ANDROID__ not ANDROID

The latter doesn't appear to be set by the NDK.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
 android/Makefile       | 2 +-
 main.c                 | 8 ++++----
 openconnect-internal.h | 2 +-
 openssl.c              | 2 +-
 ssl.c                  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/Makefile b/android/Makefile
index 633f2e73..c1041bce 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -247,7 +247,7 @@ OPENCONNECT_BUILD := $(TRIPLET)/openconnect
 $(OPENCONNECT_BUILD)/Makefile: $(GNUTLS_DEPS) $(LIBXML_DEPS) ../configure
 	mkdir -p $(OPENCONNECT_BUILD)
 	cd $(OPENCONNECT_BUILD) && ../../../configure $(CONFIGURE_ARGS) \
-	CFLAGS="--sysroot=$(NDK_SYSROOT) -DNO_BROKEN_DTLS_CHECK -DANDROID" \
+	CFLAGS="--sysroot=$(NDK_SYSROOT) -DNO_BROKEN_DTLS_CHECK" \
 	GNUTLS_LIBS="$(shell PKG_CONFIG_LIBDIR=$(OC_SYSROOT)/lib/pkgconfig pkg-config --static --libs gnutls)" --enable-shared
 
 openconnect: $(OPENCONNECT_BUILD)/Makefile
diff --git a/main.c b/main.c
index dfb7d3be..c5ebd57a 100644
--- a/main.c
+++ b/main.c
@@ -29,7 +29,7 @@
 #endif
 
 #include <stdio.h>
-#ifdef ANDROID
+#ifdef __ANDROID__
 #include <android/log.h>
 #else
 #include <syslog.h>
@@ -756,7 +756,7 @@ int main(int argc, char **argv)
 		exit(1);
 
 	if (use_syslog) {
-#ifndef ANDROID
+#ifndef __ANDROID__
 		openlog("openconnect", LOG_PID, LOG_DAEMON);
 #endif
 		vpninfo->progress = syslog_progress;
@@ -937,7 +937,7 @@ void write_progress(void *_vpninfo, int level, const char *fmt, ...)
 	}
 }
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 void syslog_progress(void *_vpninfo, int level, const char *fmt, ...)
 {
 	static int l[4] = {
@@ -959,7 +959,7 @@ void syslog_progress(void *_vpninfo, int level, const char *fmt, ...)
 		va_end(args2);
 	}
 }
-#else /* !ANDROID */
+#else /* !__ANDROID__ */
 void syslog_progress(void *_vpninfo, int level, const char *fmt, ...)
 {
 	int priority = level ? LOG_INFO : LOG_NOTICE;
diff --git a/openconnect-internal.h b/openconnect-internal.h
index 3355c3d8..8ec2dc52 100644
--- a/openconnect-internal.h
+++ b/openconnect-internal.h
@@ -385,7 +385,7 @@ int  __attribute__ ((format (printf, 2, 3)))
     openconnect_SSL_printf(struct openconnect_info *vpninfo, const char *fmt, ...);
 int openconnect_print_err_cb(const char *str, size_t len, void *ptr);
 #define openconnect_report_ssl_errors(v) ERR_print_errors_cb(openconnect_print_err_cb, (v))
-#if defined(FAKE_ANDROID_KEYSTORE) || defined(ANDROID)
+#if defined(FAKE_ANDROID_KEYSTORE) || defined(__ANDROID__)
 #define ANDROID_KEYSTORE
 #endif
 #ifdef ANDROID_KEYSTORE
diff --git a/openssl.c b/openssl.c
index 741f5517..5e2a94ea 100644
--- a/openssl.c
+++ b/openssl.c
@@ -762,7 +762,7 @@ static int load_certificate(struct openconnect_info *vpninfo)
 		}
 		return 0;
 	}
-#endif /* ANDROID */
+#endif /* ANDROID_KEYSTORE */
 
 	if (vpninfo->cert_type == CERT_TYPE_UNKNOWN) {
 		FILE *f = fopen(vpninfo->sslkey, "r");
diff --git a/ssl.c b/ssl.c
index 5d40a644..7a086093 100644
--- a/ssl.c
+++ b/ssl.c
@@ -35,7 +35,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#if defined(__linux__) || defined(ANDROID)
+#if defined(__linux__) || defined(__ANDROID__)
 #include <sys/vfs.h>
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__APPLE__)
 #include <sys/param.h>