Added __ANDROID__ macro overloads

ras0219-msft · ras0219-msft · commit 4bf7f17dab0d · 2014-11-11T14:04:21.000-08:00
diff --git a/Release/include/cpprest/asyncrt_utils.h b/Release/include/cpprest/asyncrt_utils.h
@@ -49,7 +49,7 @@ namespace pplx = Concurrency;
 
 #ifndef _MS_WINDOWS
 #include <boost/algorithm/string.hpp>
-#ifndef ANDROID // CodePlex 269
+#if !defined(ANDROID) && !defined(__ANDROID__) // CodePlex 269
 #include <xlocale.h>
 #endif
 #endif
@@ -172,7 +172,7 @@ namespace details
         _ASYNCRTIMP scoped_c_thread_locale();
         _ASYNCRTIMP ~scoped_c_thread_locale();
 
-#ifndef ANDROID // CodePlex 269
+#if !defined(ANDROID) && !defined(__ANDROID__) // CodePlex 269
 #ifdef _MS_WINDOWS
         typedef _locale_t xplat_locale;
 #else
@@ -185,7 +185,7 @@ namespace details
 #ifdef _MS_WINDOWS
         std::string m_prevLocale;
         int m_prevThreadSetting;
-#elif !defined(ANDROID)
+#elif !(defined(ANDROID) || defined(__ANDROID__))
         locale_t m_prevLocale;
 #endif
         scoped_c_thread_locale(const scoped_c_thread_locale &);
diff --git a/Release/include/cpprest/details/linux_compat.h b/Release/include/cpprest/details/linux_compat.h
@@ -25,7 +25,7 @@
 #include <sstream>
 #include <iostream>
 
-#if defined(ANDROID) && defined(__arm__)
+#if (defined(ANDROID) || defined(__ANDROID__)) && defined(__arm__)
 // Cdecl is not used on ARM
 #define __cdecl
 #else
diff --git a/Release/include/cpprest/x509_cert_utilities.h b/Release/include/cpprest/x509_cert_utilities.h
@@ -30,7 +30,7 @@
 #include <vector>
 #include <string>
 
-#if defined(__APPLE__) || defined(ANDROID) || (defined(_MS_WINDOWS)  && !defined(__cplusplus_winrt) && !defined(_M_ARM))
+#if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__)) || (defined(_MS_WINDOWS)  && !defined(__cplusplus_winrt) && !defined(_M_ARM))
 
 #include <boost/asio/ssl.hpp>
 
diff --git a/Release/include/pplx/pplxinterface.h b/Release/include/pplx/pplxinterface.h
@@ -48,7 +48,7 @@
 #include <atomic>
 #endif
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
 // This prevents users from requiring -Wno-attributes when using gcc-4.8 with the android NDK.
 #define _pplx_cdecl
 #else
diff --git a/Release/include/pplx/threadpool.h b/Release/include/pplx/threadpool.h
@@ -38,15 +38,15 @@
 #pragma clang diagnostic pop
 #endif
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
 #include <atomic>
 #include <jni.h>
 #include "pplx/pplx.h"
 #endif
 
 namespace crossplat {
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
 // IDEA: Break this section into a separate android/jni header
 extern std::atomic<JavaVM*> JVM;
 JNIEnv* get_jvm_env();
@@ -120,7 +120,7 @@ class threadpool
         schedule([]() -> void { throw _cancel_thread(); });
     }
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
     static void detach_from_java(void*)
     {
         JVM.load()->DetachCurrentThread();
@@ -129,7 +129,7 @@ class threadpool
 
     static void* thread_start(void *arg)
     {
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
         // Spinlock on the JVM calling JNI_OnLoad()
         while (JVM == nullptr)
         {
@@ -151,15 +151,15 @@ class threadpool
         catch (...)
         {
             // Something bad happened
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
             // Reach into the depths of the 'droid!
             // NOTE: Uses internals of the bionic library
             // Written against android ndk r9d, 7/26/2014
             __pthread_cleanup_pop(&__cleanup, true);
             throw;
 #endif
         }
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
         pthread_cleanup_pop(true);
 #endif
         return arg;
diff --git a/Release/src/http/client/http_linux.cpp b/Release/src/http/client/http_linux.cpp
@@ -446,7 +446,7 @@ namespace web { namespace http
                 boost::asio::streambuf m_body_buf;
                 std::shared_ptr<linux_connection> m_connection;
 
-#if defined(__APPLE__) || defined(ANDROID)
+#if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__))
                 bool m_openssl_failed;
 #endif
 
@@ -647,7 +647,7 @@ namespace web { namespace http
                     // certificate chain, the rest are optional intermediate certificates, followed
                     // finally by the root CA self signed certificate.
 
-#if defined(__APPLE__) || defined(ANDROID)
+#if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__))
                     // On OS X, iOS, and Android, OpenSSL doesn't have access to where the OS
                     // stores keychains. If OpenSSL fails we will doing verification at the
                     // end using the whole certificate chain so wait until the 'leaf' cert.
@@ -1154,7 +1154,7 @@ namespace web { namespace http
                 , m_needChunked(false)
                 , m_timer(static_cast<int>(client->client_config().timeout().count()))
                 , m_connection(connection)
-#if defined(__APPLE__) || defined(ANDROID)
+#if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__))
                 , m_openssl_failed(false)
 #endif
             {}
diff --git a/Release/src/http/client/x509_cert_utilities.cpp b/Release/src/http/client/x509_cert_utilities.cpp
@@ -39,7 +39,7 @@
 #include <Security/SecTrust.h>
 #endif
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
 #include <jni.h>
 using namespace crossplat;
 #endif
@@ -50,7 +50,7 @@ using namespace crossplat;
 
 namespace web { namespace http { namespace client { namespace details {
 
-#if defined(__APPLE__) || defined(ANDROID) || (defined(_MS_WINDOWS)  && !defined(__cplusplus_winrt) && !defined(_M_ARM))
+#if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__)) || (defined(_MS_WINDOWS)  && !defined(__cplusplus_winrt) && !defined(_M_ARM))
 bool verify_cert_chain_platform_specific(boost::asio::ssl::verify_context &verifyCtx, const std::string &hostName)
 {
     X509_STORE_CTX *storeContext = verifyCtx.native_handle();
@@ -263,7 +263,7 @@ bool verify_X509_cert_chain(const std::vector<std::string> &certChain, const std
 }
 #endif
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
 
 /// <summary>
 /// Helper function to check return value and see if any exceptions
diff --git a/Release/src/http/oauth/oauth1.cpp b/Release/src/http/oauth/oauth1.cpp
@@ -60,7 +60,7 @@ namespace experimental
 #include <bcrypt.h>
 
 std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& key, const utility::string_t& data)
-{
+{
     NTSTATUS status;
     BCRYPT_ALG_HANDLE alg_handle = nullptr;
     BCRYPT_HASH_HANDLE hash_handle = nullptr;
@@ -112,7 +112,7 @@ std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& ke
         BCryptCloseAlgorithmProvider(alg_handle, 0);
     }
 
-    return hash;
+    return hash;
 }
 
 #elif defined(_MS_WINDOWS) && defined(__cplusplus_winrt) // Windows RT
@@ -122,7 +122,7 @@ using namespace Windows::Security::Cryptography::Core;
 using namespace Windows::Storage::Streams;
 
 std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& key, const utility::string_t& data)
-{
+{
     Platform::String^ data_str = ref new Platform::String(data.c_str());
     Platform::String^ key_str = ref new Platform::String(key.c_str());
 
@@ -135,23 +135,23 @@ std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& ke
 
     Platform::Array<unsigned char, 1>^ arr;
     CryptographicBuffer::CopyToByteArray(signed_buffer, &arr);
-    return std::vector<unsigned char>(arr->Data, arr->Data + arr->Length);
+    return std::vector<unsigned char>(arr->Data, arr->Data + arr->Length);
 }
 
 #else // Linux, Mac OS X
 
 #include <openssl/hmac.h>
 
 std::vector<unsigned char> oauth1_config::_hmac_sha1(const utility::string_t& key, const utility::string_t& data)
-{
+{
     unsigned char digest[HMAC_MAX_MD_CBLOCK];
     unsigned int digest_len = 0;
 
     HMAC(EVP_sha1(), key.c_str(), static_cast<int>(key.length()),
             (const unsigned char*) data.c_str(), data.length(),
             digest, &digest_len);
 
-    return std::vector<unsigned char>(digest, digest + digest_len);
+    return std::vector<unsigned char>(digest, digest + digest_len);
 }
 
 #endif
diff --git a/Release/src/pch/stdafx.h b/Release/src/pch/stdafx.h
@@ -70,7 +70,7 @@
 #include <atomic>
 #include <signal.h>
 #include "pthread.h"
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
 // Boost doesn't recognize libstdcpp on top of clang correctly
 #include "boost/config/stdlib/libstdcpp3.hpp"
 #undef BOOST_NO_CXX11_SMART_PTR
diff --git a/Release/src/pplx/threadpool.cpp b/Release/src/pplx/threadpool.cpp
@@ -23,7 +23,7 @@ namespace crossplat
 // initialize the static shared threadpool
 threadpool threadpool::s_shared(40);
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
 // This pointer will be 0-initialized by default (at load time).
 std::atomic<JavaVM*> JVM;
 
@@ -47,7 +47,7 @@ JNIEnv* get_jvm_env()
 
 }
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
 extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
 {
    JNIEnv* env;
diff --git a/Release/src/utilities/asyncrt_utils.cpp b/Release/src/utilities/asyncrt_utils.cpp
@@ -55,7 +55,7 @@ namespace utility
 namespace details
 {
 
-#ifndef ANDROID
+#if !defined(ANDROID) && !defined(__ANDROID__)
 std::once_flag g_c_localeFlag;
 std::unique_ptr<scoped_c_thread_locale::xplat_locale, void(*)(scoped_c_thread_locale::xplat_locale *)> g_c_locale(nullptr, [](scoped_c_thread_locale::xplat_locale *){});
 scoped_c_thread_locale::xplat_locale scoped_c_thread_locale::c_locale()
@@ -124,7 +124,7 @@ scoped_c_thread_locale::~scoped_c_thread_locale()
         _configthreadlocale(m_prevThreadSetting);
     }
 }
-#elif defined(ANDROID)
+#elif (defined(ANDROID) || defined(__ANDROID__))
 scoped_c_thread_locale::scoped_c_thread_locale() {}
 scoped_c_thread_locale::~scoped_c_thread_locale() {}
 #else
@@ -977,7 +977,7 @@ datetime __cdecl datetime::from_string(const utility::string_t& dateString, date
         }
     }
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
     // HACK: The (nonportable?) POSIX function timegm is not available in
     //       bionic. As a workaround[1][2], we set the C library timezone to
     //       UTC, call mktime, then set the timezone back. However, the C
diff --git a/Release/src/websockets/client/ws_client.cpp b/Release/src/websockets/client/ws_client.cpp
@@ -119,7 +119,7 @@ class wspp_client : public _websocket_client_impl, public std::enable_shared_fro
         _websocket_client_impl(std::move(config)),
         m_state(CREATED),
         m_num_sends(0)
-#if defined(__APPLE__) || defined(ANDROID) || defined(_MS_WINDOWS)
+#if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__)) || defined(_MS_WINDOWS)
         , m_openssl_failed(false)
 #endif
     {}
@@ -201,12 +201,12 @@ class wspp_client : public _websocket_client_impl, public std::enable_shared_fro
                 sslContext->set_default_verify_paths();
                 sslContext->set_options(boost::asio::ssl::context::default_workarounds);
                 sslContext->set_verify_mode(boost::asio::ssl::context::verify_peer);
-#if defined(__APPLE__) || defined(ANDROID) || defined(_MS_WINDOWS)
+#if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__)) || defined(_MS_WINDOWS)
                 m_openssl_failed = false;
 #endif
                 sslContext->set_verify_callback([this](bool preverified, boost::asio::ssl::verify_context &verifyCtx)
                 {
-#if defined(__APPLE__) || defined(ANDROID) || defined(_MS_WINDOWS)
+#if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__)) || defined(_MS_WINDOWS)
                     // On OS X, iOS, and Android, OpenSSL doesn't have access to where the OS
                     // stores keychains. If OpenSSL fails we will doing verification at the
                     // end using the whole certificate chain so wait until the 'leaf' cert.
@@ -729,7 +729,7 @@ class wspp_client : public _websocket_client_impl, public std::enable_shared_fro
     // Used to track if any of the OpenSSL server certificate verifications
     // failed. This can safely be tracked at the client level since connections
     // only happen once for each client.
-#if defined(__APPLE__) || defined(ANDROID) || defined(_MS_WINDOWS)
+#if defined(__APPLE__) || (defined(ANDROID) || defined(__ANDROID__)) || defined(_MS_WINDOWS)
     bool m_openssl_failed;
 #endif
 
diff --git a/Release/tests/common/TestRunner/test_runner.cpp b/Release/tests/common/TestRunner/test_runner.cpp
@@ -381,7 +381,7 @@ bool IsTestIgnored(UnitTest::Test *pTest)
     if(pTest->m_properties.Has("Ignore:Windows")) return true;
 #elif defined(__APPLE__)
     if(pTest->m_properties.Has("Ignore:Apple")) return true;
-#elif defined(ANDROID)
+#elif (defined(ANDROID) || defined(__ANDROID__))
     if(pTest->m_properties.Has("Ignore:Android")) return true;
 #else
     if(pTest->m_properties.Has("Ignore:Linux")) return true;
diff --git a/Release/tests/common/UnitTestpp/src/TestRunner.cpp b/Release/tests/common/UnitTestpp/src/TestRunner.cpp
@@ -41,7 +41,7 @@
 #include <future>
 #endif
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
 #include <jni.h>
 #include <boost/scope_exit.hpp>
 #endif
@@ -128,7 +128,7 @@ int TestRunner::GetTestTimeout(Test* const curTest, int const defaultTestTimeInM
 }
 
 
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
 static JavaVM* JVM = nullptr;
 
 extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)
@@ -177,7 +177,7 @@ void TestRunner::RunTest(TestResults* const result, Test* const curTest, int con
         // Timed wait requires async execution.
         auto testRunnerFuture = std::async(std::launch::async, [&]()
         {
-#if defined(ANDROID)
+#if (defined(ANDROID) || defined(__ANDROID__))
             JNIEnv* env = nullptr;
             auto result = JVM->AttachCurrentThread(&env, nullptr);
             if (result != JNI_OK)
diff --git a/Release/tests/functional/json/parsing_tests.cpp b/Release/tests/functional/json/parsing_tests.cpp
@@ -28,7 +28,7 @@
 
 #if defined(_MS_WINDOWS) || defined(__APPLE__)
 #include <regex>
-#elif defined(ANDROID)
+#elif (defined(ANDROID) || defined(__ANDROID__))
 #else
 // GCC 4.8 doesn't support regex very well, fall back to Boost. Revist in GCC 4.9.
 #include <boost/regex.hpp>
@@ -45,7 +45,7 @@ namespace tests { namespace functional { namespace json_tests {
 #if defined(_MS_WINDOWS) || defined(__APPLE__)
         static std::regex pattern(spattern);
         return std::regex_match(str, pattern, std::regex_constants::match_flag_type::match_not_null);
-#elif defined(ANDROID)
+#elif (defined(ANDROID) || defined(__ANDROID__))
 	return str.find("Syntax error: ") != std::string::npos;
 #else
         static boost::regex pattern(spattern);
diff --git a/Release/tests/functional/websockets/utilities/test_websocket_server.cpp b/Release/tests/functional/websockets/utilities/test_websocket_server.cpp
@@ -52,7 +52,7 @@
 #undef htonll
 #endif
 
-#if defined(__clang__) && defined(ANDROID)
+#if defined(__clang__) && (defined(ANDROID) || defined(__ANDROID__))
 #define _WEBSOCKETPP_NULLPTR_TOKEN_ 0
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace crossplat`
`23`	`23`	`// initialize the static shared threadpool`
`24`	`24`	`threadpool threadpool::s_shared(40);`
`25`	`25`
`26`		`-#if defined(ANDROID)`
	`26`	`+#if (defined(ANDROID) \|\| defined(__ANDROID__))`
`27`	`27`	`// This pointer will be 0-initialized by default (at load time).`
`28`	`28`	`std::atomic<JavaVM*> JVM;`
`29`	`29`
`@@ -47,7 +47,7 @@ JNIEnv* get_jvm_env()`
`47`	`47`
`48`	`48`	`}`
`49`	`49`
`50`		`-#if defined(ANDROID)`
	`50`	`+#if (defined(ANDROID) \|\| defined(__ANDROID__))`
`51`	`51`	`extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved)`
`52`	`52`	`{`
`53`	`53`	`JNIEnv* env;`