MdePkg: Update Base.h to fix compilation issues with ICC.

[mirror_edk2.git] / MdePkg / Include / Base.h

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index def5aa61846a6da4e1686a645565a1ddfd616a49..f45f3442cb3a9bacb493ec8b3531cff349ceb359 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -6,7 +6,7 @@
   environment. There are a set of base libraries in the Mde Package that can\r
   be used to implement base modules.\r
 \r
-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
 Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
@@ -27,6 +27,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 #include <ProcessorBind.h>\r
 \r
+#if defined(_MSC_EXTENSIONS)\r
+//\r
+// Disable warning when last field of data structure is a zero sized array.\r
+//\r
+#pragma warning ( disable : 4200 )\r
+#endif\r
 \r
 /**\r
   Verifies the storage size of a given data type.\r
@@ -934,6 +940,11 @@ typedef UINTN RETURN_STATUS;
 ///\r
 #define RETURN_COMPROMISED_DATA      ENCODE_ERROR (33)\r
 \r
+///\r
+/// A HTTP error occurred during the network operation.\r
+///\r
+#define RETURN_HTTP_ERROR            ENCODE_ERROR (35)\r
+\r
 ///\r
 /// The string contained one or more characters that\r
 /// the device could not render and were skipped.\r
@@ -1016,7 +1027,7 @@ typedef UINTN RETURN_STATUS;
 #define SIGNATURE_64(A, B, C, D, E, F, G, H) \\r
     (SIGNATURE_32 (A, B, C, D) | ((UINT64) (SIGNATURE_32 (E, F, G, H)) << 32))\r
 \r
-#if defined(_MSC_EXTENSIONS) && !defined (MDE_CPU_EBC)\r
+#if defined(_MSC_EXTENSIONS) && !defined (__INTEL_COMPILER) && !defined (MDE_CPU_EBC)\r
   #pragma intrinsic(_ReturnAddress)\r
   /**\r
     Get the return address of the calling funcation.\r