From 9a0340097d276a81d88c548a424872c9729d8b43 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Sat, 6 Apr 2019 15:41:41 +0200
Subject: [PATCH] Move preprocessor checks into the cross-platform headers
 themselves

---
 src/CalcManager/CalculatorVector.h            |  2 --
 src/CalcManager/Header Files/CalcEngine.h     |  2 --
 src/CalcManager/Ratpack/ratpak.h              |  2 --
 src/CalcManager/UnitConverter.h               |  2 +-
 src/CalcManager/pch.h                         | 12 ++++--------
 src/CalcManager/preprocessor_cross_platform.h |  4 ++++
 src/CalcManager/sal_cross_platform.h          |  4 ++++
 src/CalcManager/winerror_cross_platform.h     |  8 ++++++++
 8 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/CalcManager/CalculatorVector.h b/src/CalcManager/CalculatorVector.h
index 4c2eb1f9..c34bbec8 100644
--- a/src/CalcManager/CalculatorVector.h
+++ b/src/CalcManager/CalculatorVector.h
@@ -7,10 +7,8 @@
 #include <string>
 #include <vector>
 
-#ifndef _WIN32
 #include "winerror_cross_platform.h"
 #include "sal_cross_platform.h"
-#endif
 
 template <typename TType>
 class CalculatorVector
diff --git a/src/CalcManager/Header Files/CalcEngine.h b/src/CalcManager/Header Files/CalcEngine.h
index d44a1b8c..8f592c1d 100644
--- a/src/CalcManager/Header Files/CalcEngine.h	
+++ b/src/CalcManager/Header Files/CalcEngine.h	
@@ -14,10 +14,8 @@
 *
 \****************************************************************************/
 
-#ifndef _WIN32
 #include "win_data_types_cross_platform.h"
 #include "sal_cross_platform.h"
-#endif
 
 #include "CCommand.h"
 #include "EngineStrings.h"
diff --git a/src/CalcManager/Ratpack/ratpak.h b/src/CalcManager/Ratpack/ratpak.h
index 82947971..efb33a8f 100644
--- a/src/CalcManager/Ratpack/ratpak.h
+++ b/src/CalcManager/Ratpack/ratpak.h
@@ -17,10 +17,8 @@
 //
 //-----------------------------------------------------------------------------
 
-#ifndef _WIN32
 #include "win_data_types_cross_platform.h"
 #include "sal_cross_platform.h"
-#endif
 
 #include <cstdint>
 #include <string>
diff --git a/src/CalcManager/UnitConverter.h b/src/CalcManager/UnitConverter.h
index b17f24e8..128e44aa 100644
--- a/src/CalcManager/UnitConverter.h
+++ b/src/CalcManager/UnitConverter.h
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #pragma once
diff --git a/src/CalcManager/pch.h b/src/CalcManager/pch.h
index bba917d5..8c836af7 100644
--- a/src/CalcManager/pch.h
+++ b/src/CalcManager/pch.h
@@ -27,16 +27,12 @@
 #include <future>
 
 #include "win_data_types_cross_platform.h"
-
-#if defined(_WIN32) && defined(_MSC_VER)
-
-#include <windows.h>
-#include <winerror.h>
-
-#else
-
 #include "winerror_cross_platform.h"
 #include "sal_cross_platform.h"
 #include "preprocessor_cross_platform.h"
 
+#if defined(_WIN32) && defined(_MSC_VER)
+
+#include <windows.h>
+
 #endif
diff --git a/src/CalcManager/preprocessor_cross_platform.h b/src/CalcManager/preprocessor_cross_platform.h
index 25d7400a..5ff91454 100644
--- a/src/CalcManager/preprocessor_cross_platform.h
+++ b/src/CalcManager/preprocessor_cross_platform.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#if !defined(_WIN32) || !defined(_MSC_VER)
+
 // Empty macro definitions for Windows-specific preprocessor directives
 
 #define __pragma(x)
+
+#endif
diff --git a/src/CalcManager/sal_cross_platform.h b/src/CalcManager/sal_cross_platform.h
index c89e37d4..6abaaa84 100644
--- a/src/CalcManager/sal_cross_platform.h
+++ b/src/CalcManager/sal_cross_platform.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#if !defined(_WIN32) || !defined(_MSC_VER)
+
 // Empty macro definitions for source annotations
 
 #define _In_opt_
@@ -9,3 +11,5 @@
 #define _Inout_
 #define __in_opt
 #define _Frees_ptr_opt_
+
+#endif
diff --git a/src/CalcManager/winerror_cross_platform.h b/src/CalcManager/winerror_cross_platform.h
index 1e9ede40..8a42c49a 100644
--- a/src/CalcManager/winerror_cross_platform.h
+++ b/src/CalcManager/winerror_cross_platform.h
@@ -1,5 +1,11 @@
 #pragma once
 
+#if defined(_WIN32) && defined(_MSC_VER)
+
+#include <winerror.h>
+
+#else
+
 #include "CalcErr.h"
 
 #define E_ACCESSDENIED 0x80070005
@@ -15,3 +21,5 @@
 #define SUCCEEDED(hr) (((ResultCode)(hr)) >= 0)
 #define FAILED(hr) (((ResultCode)(hr)) < 0)
 #define SCODE_CODE(sc) ((sc) & 0xFFFF)
+
+#endif