BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

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

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index a94182f08886d8297eb0cf5a4d7aa873654eca64..523192fd79fc945c1ac122ae06da72aab3067972 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 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, 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
@@ -65,8 +65,8 @@ VERIFY_SIZE_OF (CHAR16, 2);
 \r
 //\r
 // The following three enum types are used to verify that the compiler\r
-// configuration for enum types is compliant with Section 2.3.1 of the \r
-// UEFI 2.3 Specification. These enum types and enum values are not \r
+// configuration for enum types is compliant with Section 2.3.1 of the\r
+// UEFI 2.3 Specification. These enum types and enum values are not\r
 // intended to be used. A prefix of '__' is used avoid conflicts with\r
 // other types.\r
 //\r
@@ -668,16 +668,15 @@ struct _LIST_ENTRY {
 \r
 #define VA_COPY(Dest, Start)          __va_copy (Dest, Start)\r
 \r
-#elif defined(_M_ARM)\r
+#elif defined(_M_ARM) || defined(_M_ARM64)\r
 //\r
 // MSFT ARM variable argument list support.\r
-// Same as the generic macros below, except for VA_ARG that needs extra adjustment.\r
 //\r
 \r
 typedef char* VA_LIST;\r
 \r
-#define VA_START(Marker, Parameter)     (Marker = (VA_LIST) ((UINTN) & (Parameter) + _INT_SIZE_OF(Parameter)))\r
-#define VA_ARG(Marker, TYPE)            (*(TYPE *) ((Marker += _INT_SIZE_OF(TYPE) + ((-(INTN)Marker) & (sizeof(TYPE) - 1))) - _INT_SIZE_OF (TYPE)))\r
+#define VA_START(Marker, Parameter)     __va_start (&Marker, &Parameter, _INT_SIZE_OF (Parameter), __alignof(Parameter), &Parameter)\r
+#define VA_ARG(Marker, TYPE)            (*(TYPE *) ((Marker += _INT_SIZE_OF (TYPE) + ((-(INTN)Marker) & (sizeof(TYPE) - 1))) - _INT_SIZE_OF (TYPE)))\r
 #define VA_END(Marker)                  (Marker = (VA_LIST) 0)\r
 #define VA_COPY(Dest, Start)            ((void)((Dest) = (Start)))\r
 \r
@@ -786,7 +785,7 @@ typedef CHAR8 *VA_LIST;
 \r
   This macro initializes Dest as a copy of Start, as if the VA_START macro had been applied to Dest\r
   followed by the same sequence of uses of the VA_ARG macro as had previously been used to reach\r
-  the present state of Start. \r
+  the present state of Start.\r
 \r
   @param   Dest   VA_LIST used to traverse the list of arguments.\r
   @param   Start  VA_LIST used to traverse the list of arguments.\r