From 8778ee616a623480959b2cc1934e485eedf022c6 Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Mon, 3 Feb 2020 16:20:48 +0800 Subject: [PATCH 1/1] MdePkg Base.h: Use correct style to check macro _MSC_VER value Signed-off-by: Zhiguang Liu Reviewed-by: Liming Gao --- 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 53fa6dca04..85a091b9d5 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.39.2