From 150ff9b0c1a5450e07f866d09bac5555177b31e7 Mon Sep 17 00:00:00 2001
From: fwcd <fwcdmail@gmail.com>
Date: Fri, 5 Apr 2019 14:44:44 +0200
Subject: [PATCH] Remove DECLSPEC_SELECTANY macro and make g_sids in
 EngineStrings 'inline const' instead

---
 src/CalcManager/Header Files/EngineStrings.h | 2 +-
 src/CalcManager/pch.h                        | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/CalcManager/Header Files/EngineStrings.h b/src/CalcManager/Header Files/EngineStrings.h
index d358766d..aedeb0f4 100644
--- a/src/CalcManager/Header Files/EngineStrings.h	
+++ b/src/CalcManager/Header Files/EngineStrings.h	
@@ -219,7 +219,7 @@
 #define SIDS_ERR_INPUT_OVERFLOW L"119"
 #define SIDS_ERR_OUTPUT_OVERFLOW L"120"
 
-DECLSPEC_SELECTANY std::wstring g_sids[] =
+inline const std::wstring g_sids[] =
 {
     std::wstring(SIDS_PLUS_MINUS),
     std::wstring(SIDS_C),
diff --git a/src/CalcManager/pch.h b/src/CalcManager/pch.h
index 130d2391..ffb15e23 100644
--- a/src/CalcManager/pch.h
+++ b/src/CalcManager/pch.h
@@ -38,10 +38,4 @@
 #include "winerror_cross_platform.h"
 #include "sal_cross_platform.h"
 
-#ifdef __GNUC__
-#define DECLSPEC_SELECTANY __attribute__((selectany))
-#else
-#define DECLSPEC_SELECTANY __declspec(selectany)
-#endif
-
 #endif