MdePkg Base.h: Use correct style to check macro _MSC_VER value

[mirror_edk2.git] / MdePkg / Include / Ia32 / ProcessorBind.h

diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h
index 71d53e2543bbc021d8ce8b689c44363ac83ce72c..9380380e57dd104b506b9fa3b572fab54f120a19 100644 (file)
--- a/MdePkg/Include/Ia32/ProcessorBind.h
+++ b/MdePkg/Include/Ia32/ProcessorBind.h
@@ -2,13 +2,7 @@
   Processor or Compiler specific defines and types for IA-32 architecture.\r
 \r
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under\r
-the terms and conditions of the BSD License that accompanies this distribution.\r
-The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php.\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -93,7 +87,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 #pragma warning ( disable : 4206 )\r
 \r
-#if _MSC_VER == 1800 || _MSC_VER == 1900 || _MSC_VER >= 1910\r
+#if defined(_MSC_VER) && _MSC_VER >= 1800\r
 \r
 //\r
 // Disable these warnings for VS2013.\r
@@ -287,7 +281,7 @@ typedef INT32   INTN;
   /// Microsoft* compiler specific method for EFIAPI calling convention.\r
   ///\r
   #define EFIAPI __cdecl\r
-#elif defined(__GNUC__)\r
+#elif defined(__GNUC__) || defined(__clang__)\r
   ///\r
   /// GCC specific method for EFIAPI calling convention.\r
   ///\r
@@ -300,7 +294,7 @@ typedef INT32   INTN;
   #define EFIAPI\r
 #endif\r
 \r
-#if defined(__GNUC__)\r
+#if defined(__GNUC__) || defined(__clang__)\r
   ///\r
   /// For GNU assembly code, .global or .globl can declare global symbols.\r
   /// Define this macro to unify the usage.\r