[edk2-devel] [Patch] MdePkg Base.h: Use correct style to check macro _MSC_VER value

Liming Gao posted 1 patch 4 years, 2 months ago
Failed in applying to current master (apply log)
MdePkg/Include/Base.h               | 2 +-
MdePkg/Include/Ia32/ProcessorBind.h | 2 +-
MdePkg/Include/X64/ProcessorBind.h  | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
[edk2-devel] [Patch] MdePkg Base.h: Use correct style to check macro _MSC_VER value
Posted by Liming Gao 4 years, 2 months ago
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
---
 MdePkg/Include/Base.h               | 2 +-
 MdePkg/Include/Ia32/ProcessorBind.h | 2 +-
 MdePkg/Include/X64/ProcessorBind.h  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index 321d729c04..8e5c7b0a00 100644
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -33,7 +33,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //  if the /OPT:REF linker option is used. We defined a macro as this is a
 //  a non standard extension
 //
-#if defined(_MSC_EXTENSIONS) && _MSC_VER < 1800 && !defined (MDE_CPU_EBC)
+#if defined(_MSC_VER) && _MSC_VER < 1800 && !defined (MDE_CPU_EBC)
   ///
   /// Remove global variable from the linked image if there are no references to
   /// it after all compiler and linker optimizations have been performed.
diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h
index fa4b7e8e98..9380380e57 100644
--- a/MdePkg/Include/Ia32/ProcessorBind.h
+++ b/MdePkg/Include/Ia32/ProcessorBind.h
@@ -87,7 +87,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //
 #pragma warning ( disable : 4206 )
 
-#if _MSC_VER == 1800 || _MSC_VER == 1900 || _MSC_VER >= 1910
+#if defined(_MSC_VER) && _MSC_VER >= 1800
 
 //
 // Disable these warnings for VS2013.
diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/ProcessorBind.h
index 387e9c5c9c..5d14316524 100644
--- a/MdePkg/Include/X64/ProcessorBind.h
+++ b/MdePkg/Include/X64/ProcessorBind.h
@@ -101,7 +101,7 @@
 //
 #pragma warning ( disable : 4206 )
 
-#if _MSC_VER == 1800 || _MSC_VER == 1900 || _MSC_VER >= 1910
+#if defined(_MSC_VER) && _MSC_VER >= 1800
 
 //
 // Disable these warnings for VS2013.
-- 
2.24.1.windows.2


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#53648): https://edk2.groups.io/g/devel/message/53648
Mute This Topic: https://groups.io/mt/70941870/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-