github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-23 06:25:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Android] Add conditionals

Browse source
This commit is contained in:
David Oliver 2019-05-22 14:22:34 -04:00 • committed by Jérôme Laban
commit cbb10c4ace
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CalcManager/CCalcManager.h
View file

@ -41,7 +41,7 @@ struct CalculatorManager_CreateParams
GetCEngineStringFunc GetCEngineString; GetCEngineStringFunc GetCEngineString;
}; };
#if defined(__EMSCRIPTEN__) || defined(__APPLE__) #if defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__ANDROID__)
#define DLL_EXPORT #define DLL_EXPORT
#else #else
#define DLL_EXPORT __declspec(dllexport) #define DLL_EXPORT __declspec(dllexport)

2
src/CalcManager/CalculatorManager.cpp
View file

@ -14,7 +14,7 @@ static constexpr size_t SERIALIZED_NUMBER_MINSIZE = 3;
// Converts Memory Command enum value to unsigned char, // Converts Memory Command enum value to unsigned char,
// while ignoring Warning C4309: 'conversion' : truncation of constant value // 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) #define MEMORY_COMMAND_TO_UNSIGNED_CHAR(c) static_cast<unsigned char>(c)
#else #else
#define MEMORY_COMMAND_TO_UNSIGNED_CHAR(c) __pragma(warning(push)) __pragma(warning(disable : 4309)) static_cast<unsigned char>(c) __pragma(warning(pop)) #define MEMORY_COMMAND_TO_UNSIGNED_CHAR(c) __pragma(warning(push)) __pragma(warning(disable : 4309)) static_cast<unsigned char>(c) __pragma(warning(pop))

2
src/CalcManager/CalculatorVector.h
View file

@ -10,7 +10,7 @@
#include "Ratpack/CalcErr.h" #include "Ratpack/CalcErr.h"
#include <stdexcept> // for std::out_of_range #include <stdexcept> // for std::out_of_range
#if !defined(__EMSCRIPTEN__) && !defined(__APPLE__) #if !defined(__EMSCRIPTEN__) && !defined(__APPLE__) && !defined(__ANDROID__)
#include <winerror.h> #include <winerror.h>
#include <sal.h> // for SAL #include <sal.h> // for SAL
#endif #endif

2
src/CalcManager/compat.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#if defined(__EMSCRIPTEN__) || defined(__APPLE__) #if defined(__EMSCRIPTEN__) || defined(__APPLE__) || defined(__ANDROID__)
#define HRESULT long #define HRESULT long
#define _In_opt_ #define _In_opt_

2
src/CalcManager/pch.h
View file

@ -18,7 +18,7 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#if !defined(__EMSCRIPTEN__) && !defined(__APPLE__) #if !defined(__EMSCRIPTEN__) && !defined(__APPLE__) && !defined(__ANDROID__)
#include <ppltasks.h> #include <ppltasks.h>
#include <winerror.h> #include <winerror.h>
#include <intsafe.h> #include <intsafe.h>