From cbb10c4ace012a7c4bbc7460288ece73febb6580 Mon Sep 17 00:00:00 2001
From: David Oliver <david.oliver@nventive.com>
Date: Wed, 22 May 2019 14:22:34 -0400
Subject: [PATCH] [Android] Add conditionals

---
 src/CalcManager/CCalcManager.h        | 4 ++--
 src/CalcManager/CalculatorManager.cpp | 2 +-
 src/CalcManager/CalculatorVector.h    | 2 +-
 src/CalcManager/compat.h              | 2 +-
 src/CalcManager/pch.h                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CalcManager/CCalcManager.h b/src/CalcManager/CCalcManager.h
index 7af758a3..80f574f8 100644
--- a/src/CalcManager/CCalcManager.h
+++ b/src/CalcManager/CCalcManager.h
@@ -41,8 +41,8 @@ struct CalculatorManager_CreateParams
     GetCEngineStringFunc GetCEngineString;
 };
 
-#if defined(__EMSCRIPTEN__) || defined(__APPLE__)
-#define DLL_EXPORT
+#if defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__ANDROID__)
+#define DLL_EXPORT 
 #else
 #define DLL_EXPORT __declspec(dllexport)
 #endif
diff --git a/src/CalcManager/CalculatorManager.cpp b/src/CalcManager/CalculatorManager.cpp
index c30cad2a..27735a60 100644
--- a/src/CalcManager/CalculatorManager.cpp
+++ b/src/CalcManager/CalculatorManager.cpp
@@ -14,7 +14,7 @@ static constexpr size_t SERIALIZED_NUMBER_MINSIZE = 3;
 
 // Converts Memory Command enum value to unsigned char,
 // while ignoring Warning C4309: 'conversion' : truncation of constant value
-#if defined(__EMSCRIPTEN__) || defined(__APPLE__)
+#if defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__ANDROID__)
 #define MEMORY_COMMAND_TO_UNSIGNED_CHAR(c) static_cast<unsigned char>(c)
 #else
 #define MEMORY_COMMAND_TO_UNSIGNED_CHAR(c) __pragma(warning(push)) __pragma(warning(disable : 4309)) static_cast<unsigned char>(c) __pragma(warning(pop))
diff --git a/src/CalcManager/CalculatorVector.h b/src/CalcManager/CalculatorVector.h
index ed9f213c..cf75a80b 100644
--- a/src/CalcManager/CalculatorVector.h
+++ b/src/CalcManager/CalculatorVector.h
@@ -10,7 +10,7 @@
 #include "Ratpack/CalcErr.h"
 #include <stdexcept> // for std::out_of_range
 
-#if !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
+#if !defined(__EMSCRIPTEN__) && !defined(__APPLE__) && !defined(__ANDROID__)
 #include <winerror.h>
 #include <sal.h>     // for SAL
 #endif
diff --git a/src/CalcManager/compat.h b/src/CalcManager/compat.h
index 7ffeec1a..74920e4f 100644
--- a/src/CalcManager/compat.h
+++ b/src/CalcManager/compat.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(__EMSCRIPTEN__) || defined(__APPLE__)
+#if defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__ANDROID__)
 
 #define HRESULT long
 #define _In_opt_
diff --git a/src/CalcManager/pch.h b/src/CalcManager/pch.h
index cab9e5f7..4abe2ad9 100644
--- a/src/CalcManager/pch.h
+++ b/src/CalcManager/pch.h
@@ -18,7 +18,7 @@
 #include <unordered_map>
 #include <vector>
 
-#if !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
+#if !defined(__EMSCRIPTEN__) && !defined(__APPLE__) && !defined(__ANDROID__)
 #include <ppltasks.h>
 #include <winerror.h>
 #include <intsafe.h>