Update Guid Value format.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4964 6f19259b-4bc3-4df7-8a09-765794883524

75 files changed, 98 insertions, 98 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/Acpi/Acpi.h b/EdkCompatibilityPkg/Foundation/Efi/Guid/Acpi/Acpi.h
index 866ad63915..9bf7493ffa 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/Acpi/Acpi.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/Acpi/Acpi.h
@@ -28,12 +28,12 @@ Abstract:
 

 #define EFI_ACPI_TABLE_GUID \

   { \

-    0xeb9d2d30, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0xeb9d2d30, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 #define EFI_ACPI_20_TABLE_GUID \

   { \

-    0x8868e871, 0xe4f1, 0x11d3, 0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 \

+    0x8868e871, 0xe4f1, 0x11d3, {0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81} \

   }

 

 #define EFI_ACPI_30_TABLE_GUID EFI_ACPI_20_TABLE_GUID

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/DebugImageInfoTable/DebugImageInfoTable.h b/EdkCompatibilityPkg/Foundation/Efi/Guid/DebugImageInfoTable/DebugImageInfoTable.h
index e81ebb0ae9..f62cea5485 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/DebugImageInfoTable/DebugImageInfoTable.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/DebugImageInfoTable/DebugImageInfoTable.h
@@ -27,7 +27,7 @@ Abstract:
 

 #define EFI_DEBUG_IMAGE_INFO_TABLE_GUID \

   { \

-    0x49152e77, 0x1ada, 0x4764, 0xb7, 0xa2, 0x7a, 0xfe, 0xfe, 0xd9, 0x5e, 0x8b \

+    0x49152e77, 0x1ada, 0x4764, {0xb7, 0xa2, 0x7a, 0xfe, 0xfe, 0xd9, 0x5e, 0x8b} \

   }

 

 extern EFI_GUID gEfiDebugImageInfoTableGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/GlobalVariable/GlobalVariable.h b/EdkCompatibilityPkg/Foundation/Efi/Guid/GlobalVariable/GlobalVariable.h
index c97a51f09b..3a807886c3 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/GlobalVariable/GlobalVariable.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/GlobalVariable/GlobalVariable.h
@@ -24,7 +24,7 @@ Abstract:
 

 #define EFI_GLOBAL_VARIABLE_GUID \

   { \

-    0x8BE4DF61, 0x93CA, 0x11d2, 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C \

+    0x8BE4DF61, 0x93CA, 0x11d2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C} \

   }

 

 extern EFI_GUID gEfiGlobalVariableGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/Gpt/Gpt.h b/EdkCompatibilityPkg/Foundation/Efi/Guid/Gpt/Gpt.h
index 7733067e40..ea97415fb8 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/Gpt/Gpt.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/Gpt/Gpt.h
@@ -27,17 +27,17 @@ Abstract:
 

 #define EFI_PART_TYPE_UNUSED_GUID \

   { \

-    0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 \

+    0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} \

   }

 

 #define EFI_PART_TYPE_EFI_SYSTEM_PART_GUID \

   { \

-    0xc12a7328, 0xf81f, 0x11d2, 0xba, 0x4b, 0x00, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b \

+    0xc12a7328, 0xf81f, 0x11d2, {0xba, 0x4b, 0x00, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b} \

   }

 

 #define EFI_PART_TYPE_LEGACY_MBR_GUID \

   { \

-    0x024dee41, 0x33e7, 0x11d3, 0x9d, 0x69, 0x00, 0x08, 0xc7, 0x81, 0xf3, 0x9f \

+    0x024dee41, 0x33e7, 0x11d3, {0x9d, 0x69, 0x00, 0x08, 0xc7, 0x81, 0xf3, 0x9f} \

   }

 

 extern EFI_GUID gEfiPartTypeUnusedGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/HardwareErrorVariable/HardwareErrorVariable.c b/EdkCompatibilityPkg/Foundation/Efi/Guid/HardwareErrorVariable/HardwareErrorVariable.c
index 57dbb839d0..cbf82de4d0 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/HardwareErrorVariable/HardwareErrorVariable.c
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/HardwareErrorVariable/HardwareErrorVariable.c
@@ -24,4 +24,4 @@ Abstract:
 

 EFI_GUID  gEfiHardwareErrorVariableGuid = EFI_HARDWARE_ERROR_VARIABLE_GUID;

 

-EFI_GUID_STRING(&gEfiHardwareErrorVariableGuid, "HwErr", "Hardware Error Variable GUID")
\ No newline at end of file
+EFI_GUID_STRING(&gEfiHardwareErrorVariableGuid, "HwErr", "Hardware Error Variable GUID")

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/HardwareErrorVariable/HardwareErrorVariable.h b/EdkCompatibilityPkg/Foundation/Efi/Guid/HardwareErrorVariable/HardwareErrorVariable.h
index fae3fd1a37..75960344d7 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/HardwareErrorVariable/HardwareErrorVariable.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/HardwareErrorVariable/HardwareErrorVariable.h
@@ -29,4 +29,4 @@ Abstract:
 

 extern EFI_GUID gEfiHardwareErrorVariableGuid;

 

-#endif
\ No newline at end of file
+#endif

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/Mps/Mps.h b/EdkCompatibilityPkg/Foundation/Efi/Guid/Mps/Mps.h
index 3417c69723..754fb9bfa4 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/Mps/Mps.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/Mps/Mps.h
@@ -30,7 +30,7 @@ Abstract:
 

 #define EFI_MPS_TABLE_GUID \

   { \

-    0xeb9d2d2f, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0xeb9d2d2f, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 extern EFI_GUID gEfiMpsTableGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/PcAnsi/PcAnsi.h b/EdkCompatibilityPkg/Foundation/Efi/Guid/PcAnsi/PcAnsi.h
index 6113690ac2..aa526292d8 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/PcAnsi/PcAnsi.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/PcAnsi/PcAnsi.h
@@ -24,22 +24,22 @@ Abstract:
 

 #define EFI_PC_ANSI_GUID \

   { \

-    0xe0c14753, 0xf9be, 0x11d2, 0x9a, 0x0c, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0xe0c14753, 0xf9be, 0x11d2, {0x9a, 0x0c, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 #define EFI_VT_100_GUID \

   { \

-    0xdfa66065, 0xb419, 0x11d3, 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0xdfa66065, 0xb419, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 #define EFI_VT_100_PLUS_GUID \

   { \

-    0x7baec70b, 0x57e0, 0x4c76, 0x8e, 0x87, 0x2f, 0x9e, 0x28, 0x08, 0x83, 0x43 \

+    0x7baec70b, 0x57e0, 0x4c76, {0x8e, 0x87, 0x2f, 0x9e, 0x28, 0x08, 0x83, 0x43} \

   }

 

 #define EFI_VT_UTF8_GUID \

   { \

-    0xad15a0d6, 0x8bec, 0x4acf, 0xa0, 0x73, 0xd0, 0x1d, 0xe7, 0x7e, 0x2d, 0x88 \

+    0xad15a0d6, 0x8bec, 0x4acf, {0xa0, 0x73, 0xd0, 0x1d, 0xe7, 0x7e, 0x2d, 0x88} \

   }

 

 extern EFI_GUID gEfiPcAnsiGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/SalSystemTable/SalSystemTable.h b/EdkCompatibilityPkg/Foundation/Efi/Guid/SalSystemTable/SalSystemTable.h
index 1bc0c72402..128004b93f 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/SalSystemTable/SalSystemTable.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/SalSystemTable/SalSystemTable.h
@@ -26,7 +26,7 @@ Abstract:
 

 #define EFI_SAL_SYSTEM_TABLE_GUID \

   { \

-    0xeb9d2d32, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0xeb9d2d32, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 extern EFI_GUID gEfiSalSystemTableGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Guid/SmBios/SmBios.h b/EdkCompatibilityPkg/Foundation/Efi/Guid/SmBios/SmBios.h
index 4d53bb3f47..e177709fee 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Guid/SmBios/SmBios.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Guid/SmBios/SmBios.h
@@ -28,7 +28,7 @@ Abstract:
 

 #define EFI_SMBIOS_TABLE_GUID \

   { \

-    0xeb9d2d31, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0xeb9d2d31, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 extern EFI_GUID gEfiSmbiosTableGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
index 7292caea0f..aee6e3b0e8 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiDevicePath.h
@@ -308,19 +308,19 @@ typedef struct {
 #define MSG_VENDOR_DP             0x0a

 

 #define DEVICE_PATH_MESSAGING_PC_ANSI \

-    { 0xe0c14753, 0xf9be, 0x11d2,  0x9a, 0x0c, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d  }

+    { 0xe0c14753, 0xf9be, 0x11d2,  {0x9a, 0x0c, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d}  }

 

 #define DEVICE_PATH_MESSAGING_VT_100 \

-    { 0xdfa66065, 0xb419, 0x11d3,  0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d  }

+    { 0xdfa66065, 0xb419, 0x11d3,  {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d}  }

 

 #define DEVICE_PATH_MESSAGING_VT_100_PLUS \

-    { 0x7baec70b, 0x57e0, 0x4c76, 0x8e, 0x87, 0x2f, 0x9e, 0x28, 0x08, 0x83, 0x43  }

+    { 0x7baec70b, 0x57e0, 0x4c76, {0x8e, 0x87, 0x2f, 0x9e, 0x28, 0x08, 0x83, 0x43}  }

 

 #define DEVICE_PATH_MESSAGING_VT_UTF8 \

-    { 0xad15a0d6, 0x8bec, 0x4acf, 0xa0, 0x73, 0xd0, 0x1d, 0xe7, 0x7e, 0x2d, 0x88 }

+    { 0xad15a0d6, 0x8bec, 0x4acf, {0xa0, 0x73, 0xd0, 0x1d, 0xe7, 0x7e, 0x2d, 0x88} }

 

 #define DEVICE_PATH_MESSAGING_UART_FLOW_CONTROL \

-    { 0x37499a9d, 0x542f, 0x4c89, 0xa0, 0x26, 0x35, 0xda, 0x14, 0x20, 0x94, 0xe4 }

+    { 0x37499a9d, 0x542f, 0x4c89, {0xa0, 0x26, 0x35, 0xda, 0x14, 0x20, 0x94, 0xe4} }

 

 typedef struct {

   EFI_DEVICE_PATH_PROTOCOL        Header;

@@ -331,7 +331,7 @@ typedef struct {
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)

 

 #define DEVICE_PATH_MESSAGING_SAS \

-    { 0xd487ddb4, 0x008b, 0x11d9, 0xaf, 0xdc, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d }

+    { 0xd487ddb4, 0x008b, 0x11d9, {0xaf, 0xdc, 0x00, 0x10, 0x83, 0xff, 0xca, 0x4d} }

 

 typedef struct {

   EFI_DEVICE_PATH_PROTOCOL        Header;

@@ -454,7 +454,7 @@ typedef struct {
 #define BBS_TYPE_UNKNOWN          0xFF

 

 #define UNKNOWN_DEVICE_GUID \

-  { 0xcf31fac5, 0xc24e, 0x11d2,  0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b  }

+  { 0xcf31fac5, 0xc24e, 0x11d2,  {0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b}  }

 

 typedef struct {

   VENDOR_DEVICE_PATH              DevicePath;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/AbsolutePointer/AbsolutePointer.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/AbsolutePointer/AbsolutePointer.h
index 5f73163bde..aa4591ab44 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/AbsolutePointer/AbsolutePointer.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/AbsolutePointer/AbsolutePointer.h
@@ -26,7 +26,7 @@ Abstract:
 

 #define EFI_ABSOLUTE_POINTER_PROTOCOL_GUID \

   { \

-      0x8D59D32B, 0xC655, 0x4AE9, 0x9B, 0x15, 0xF2, 0x59, 0x04, 0x99, 0x2A, 0x43 \

+      0x8D59D32B, 0xC655, 0x4AE9, {0x9B, 0x15, 0xF2, 0x59, 0x04, 0x99, 0x2A, 0x43} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_ABSOLUTE_POINTER_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/AcpiTable/AcpiTable.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/AcpiTable/AcpiTable.h
index 0464369cf4..75a3acf78e 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/AcpiTable/AcpiTable.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/AcpiTable/AcpiTable.h
@@ -31,7 +31,7 @@ Abstract:
 //

 #define EFI_ACPI_TABLE_PROTOCOL_GUID \

   { \

-    0xffe06bdd, 0x6107, 0x46a6, 0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c \

+    0xffe06bdd, 0x6107, 0x46a6, {0x7b, 0xb2, 0x5a, 0x9c, 0x7e, 0xc5, 0x27, 0x5c} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_ACPI_TABLE_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Arp/Arp.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Arp/Arp.h
index f63df27ac6..0f449d7e87 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Arp/Arp.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Arp/Arp.h
@@ -25,10 +25,10 @@ Abstract:
 #include EFI_PROTOCOL_DEFINITION (ServiceBinding)

 

 #define EFI_ARP_SERVICE_BINDING_PROTOCOL_GUID \

-  { 0xf44c00ee, 0x1f2c, 0x4a00, 0xaa, 0x9, 0x1c, 0x9f, 0x3e, 0x8, 0x0, 0xa3 }

+  { 0xf44c00ee, 0x1f2c, 0x4a00, {0xaa, 0x9, 0x1c, 0x9f, 0x3e, 0x8, 0x0, 0xa3} }

 

 #define EFI_ARP_PROTOCOL_GUID \

-  { 0xf4b427bb, 0xba21, 0x4f16, 0xbc, 0x4e, 0x43, 0xe4, 0x16, 0xab, 0x61, 0x9c }

+  { 0xf4b427bb, 0xba21, 0x4f16, {0xbc, 0x4e, 0x43, 0xe4, 0x16, 0xab, 0x61, 0x9c} }

 

 EFI_FORWARD_DECLARATION (EFI_ARP_PROTOCOL);

 

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Bis/Bis.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Bis/Bis.h
index 21d4908fc3..2d7f39f0cb 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Bis/Bis.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Bis/Bis.h
@@ -122,7 +122,7 @@ typedef struct _EFI_BIS_SIGNATURE_INFO {
 //

 #define EFI_BIS_PROTOCOL_GUID \

   { \

-    0x0b64aab0, 0x5429, 0x11d4, 0x98, 0x16, 0x00, 0xa0, 0xc9, 0x1f, 0xad, 0xcf \

+    0x0b64aab0, 0x5429, 0x11d4, {0x98, 0x16, 0x00, 0xa0, 0xc9, 0x1f, 0xad, 0xcf} \

   }

 

 typedef struct _EFI_BIS_PROTOCOL  EFI_BIS_PROTOCOL;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h
index 8d644f1765..8cdcecdb1a 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h
@@ -28,7 +28,7 @@ Abstract:
 

 #define EFI_BLOCK_IO_PROTOCOL_GUID \

   { \

-    0x964e5b21, 0x6459, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \

+    0x964e5b21, 0x6459, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/BusSpecificDriverOverride/BusSpecificDriverOverride.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/BusSpecificDriverOverride/BusSpecificDriverOverride.h
index 9409874a43..4b97342558 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/BusSpecificDriverOverride/BusSpecificDriverOverride.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/BusSpecificDriverOverride/BusSpecificDriverOverride.h
@@ -27,7 +27,7 @@ Abstract:
 //

 #define EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL_GUID \

   { \

-    0x3bc1b285, 0x8a15, 0x4a82, 0xaa, 0xbf, 0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65 \

+    0x3bc1b285, 0x8a15, 0x4a82, {0xaa, 0xbf, 0x4d, 0x7d, 0x13, 0xfb, 0x32, 0x65} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName/ComponentName.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName/ComponentName.h
index 4e19ff5c0a..0458174854 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName/ComponentName.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName/ComponentName.h
@@ -29,7 +29,7 @@ Revision History
 //

 #define EFI_COMPONENT_NAME_PROTOCOL_GUID \

   { \

-    0x107a772c, 0xd5e1, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0x107a772c, 0xd5e1, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_COMPONENT_NAME_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h
index 6861ac19c0..9c52fef5ed 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h
@@ -30,7 +30,7 @@ Revision History
 

 #define EFI_COMPONENT_NAME2_PROTOCOL_GUID \

   { \

-    0x6a7a5cff, 0xe8d9, 0x4f70, 0xba, 0xda, 0x75, 0xab, 0x30, 0x25, 0xce, 0x14 \

+    0x6a7a5cff, 0xe8d9, 0x4f70, {0xba, 0xda, 0x75, 0xab, 0x30, 0x25, 0xce, 0x14} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_COMPONENT_NAME2_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugPort/DebugPort.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugPort/DebugPort.h
index 87f78cbfab..e29e4b42de 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugPort/DebugPort.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugPort/DebugPort.h
@@ -27,7 +27,7 @@ Abstract:
 //

 #define EFI_DEBUGPORT_PROTOCOL_GUID \

   { \

-    0xEBA4E8D2, 0x3858, 0x41EC, 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 \

+    0xEBA4E8D2, 0x3858, 0x41EC, {0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0} \

   }

 

 extern EFI_GUID gEfiDebugPortProtocolGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h
index 5c08d5a0ce..ad80dc4c23 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h
@@ -33,7 +33,7 @@ Abstract:
 //

 #define EFI_DEBUG_SUPPORT_PROTOCOL_GUID \

   { \

-    0x2755590C, 0x6F3C, 0x42FA, 0x9E, 0xA4, 0xA3, 0xBA, 0x54, 0x3C, 0xDA, 0x25 \

+    0x2755590C, 0x6F3C, 0x42FA, {0x9E, 0xA4, 0xA3, 0xBA, 0x54, 0x3C, 0xDA, 0x25} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Decompress/Decompress.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Decompress/Decompress.h
index 88a50ab67a..447965219b 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Decompress/Decompress.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Decompress/Decompress.h
@@ -24,7 +24,7 @@ Abstract:
 

 #define EFI_DECOMPRESS_PROTOCOL_GUID \

   { \

-    0xd8117cfe, 0x94a6, 0x11d4, 0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0xd8117cfe, 0x94a6, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_DECOMPRESS_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DeviceIo/DeviceIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DeviceIo/DeviceIo.h
index 270e0a46ef..66e1059bf7 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DeviceIo/DeviceIo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DeviceIo/DeviceIo.h
@@ -28,7 +28,7 @@ Abstract:
 

 #define EFI_DEVICE_IO_PROTOCOL_GUID \

   { \

-    0xaf6ac311, 0x84c3, 0x11d2, 0x8e, 0x3c, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \

+    0xaf6ac311, 0x84c3, 0x11d2, {0x8e, 0x3c, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_DEVICE_IO_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h
index 4991e2b012..4e2f661c51 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePath/DevicePath.h
@@ -32,7 +32,7 @@ Abstract:
 //

 #define EFI_DEVICE_PATH_PROTOCOL_GUID \

   { \

-    0x9576e91, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \

+    0x9576e91, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \

   }

 

 #pragma pack(push, 1)

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathFromText/DevicePathFromText.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathFromText/DevicePathFromText.h
index 8218cfce87..000631c6cf 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathFromText/DevicePathFromText.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathFromText/DevicePathFromText.h
@@ -25,7 +25,7 @@ Abstract:
 //

 #define EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL_GUID \

   { \

-    0x5c99a21, 0xc70f, 0x4ad2, 0x8a, 0x5f, 0x35, 0xdf, 0x33, 0x43, 0xf5, 0x1e \

+    0x5c99a21, 0xc70f, 0x4ad2, {0x8a, 0x5f, 0x35, 0xdf, 0x33, 0x43, 0xf5, 0x1e} \

   }

 

 typedef

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathToText/DevicePathToText.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathToText/DevicePathToText.h
index 4d03aad257..0731b4805a 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathToText/DevicePathToText.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathToText/DevicePathToText.h
@@ -26,7 +26,7 @@ Abstract:
 //

 #define EFI_DEVICE_PATH_TO_TEXT_PROTOCOL_GUID \

   { \

-    0x8b843e20, 0x8132, 0x4852, 0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c  \

+    0x8b843e20, 0x8132, 0x4852, {0x90, 0xcc, 0x55, 0x1a, 0x4e, 0x4a, 0x7f, 0x1c}  \

   }

 

 typedef

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathUtilities/DevicePathUtilities.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathUtilities/DevicePathUtilities.h
index 6cf2c69533..cf2ec43337 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathUtilities/DevicePathUtilities.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DevicePathUtilities/DevicePathUtilities.h
@@ -25,7 +25,7 @@ Abstract:
 //

 #define EFI_DEVICE_PATH_UTILITIES_PROTOCOL_GUID \

   { \

-    0x379be4e, 0xd706, 0x437d, 0xb0, 0x37, 0xed, 0xb8, 0x2f, 0xb7, 0x72, 0xa4  \

+    0x379be4e, 0xd706, 0x437d, {0xb0, 0x37, 0xed, 0xb8, 0x2f, 0xb7, 0x72, 0xa4}  \

   }

 

 typedef

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h
index d6ad0fff2e..a923eb9a3e 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h
@@ -27,10 +27,10 @@ Abstract:
 

 //GUID definitions

 #define EFI_DHCP4_PROTOCOL_GUID \

-  {0x8a219718, 0x4ef5, 0x4761, 0x91, 0xc8, 0xc0, 0xf0, 0x4b, 0xda, 0x9e, 0x56}

+  {0x8a219718, 0x4ef5, 0x4761, {0x91, 0xc8, 0xc0, 0xf0, 0x4b, 0xda, 0x9e, 0x56}}

 

 #define EFI_DHCP4_SERVICE_BINDING_PROTOCOL_GUID \

-  {0x9d9a39d8, 0xbd42, 0x4a73, 0xa4, 0xd5, 0x8e, 0xe9, 0x4b, 0xe1, 0x13, 0x80}

+  {0x9d9a39d8, 0xbd42, 0x4a73, {0xa4, 0xd5, 0x8e, 0xe9, 0x4b, 0xe1, 0x13, 0x80}}

   

 extern EFI_GUID gEfiDhcp4ProtocolGuid;

 extern EFI_GUID gEfiDhcp4ServiceBindingProtocolGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DiskIo/DiskIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DiskIo/DiskIo.h
index cb703bac4b..0762ee09a3 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DiskIo/DiskIo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DiskIo/DiskIo.h
@@ -28,7 +28,7 @@ Abstract:
 

 #define EFI_DISK_IO_PROTOCOL_GUID \

   { \

-    0xce345171, 0xba0b, 0x11d2, 0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \

+    0xce345171, 0xba0b, 0x11d2, {0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_DISK_IO_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverBinding/DriverBinding.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverBinding/DriverBinding.h
index 638363c347..ae9acf6660 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverBinding/DriverBinding.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverBinding/DriverBinding.h
@@ -29,7 +29,7 @@ Revision History
 //

 #define EFI_DRIVER_BINDING_PROTOCOL_GUID \

   { \

-    0x18a031ab, 0xb443, 0x4d1a, 0xa5, 0xc0, 0xc, 0x9, 0x26, 0x1e, 0x9f, 0x71 \

+    0x18a031ab, 0xb443, 0x4d1a, {0xa5, 0xc0, 0xc, 0x9, 0x26, 0x1e, 0x9f, 0x71} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_DRIVER_BINDING_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration/DriverConfiguration.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration/DriverConfiguration.h
index 783807b600..f02258f8fd 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration/DriverConfiguration.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration/DriverConfiguration.h
@@ -29,7 +29,7 @@ Revision History
 //

 #define EFI_DRIVER_CONFIGURATION_PROTOCOL_GUID \

   { \

-    0x107a772b, 0xd5e1, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0x107a772b, 0xd5e1, 0x11d4, {0x9a, 0x46, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_DRIVER_CONFIGURATION_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics/DriverDiagnostics.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics/DriverDiagnostics.h
index 9eba9901bb..27de990810 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics/DriverDiagnostics.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics/DriverDiagnostics.h
@@ -29,7 +29,7 @@ Revision History
 //

 #define EFI_DRIVER_DIAGNOSTICS_PROTOCOL_GUID \

   { \

-    0x0784924f, 0xe296, 0x11d4, 0x9a, 0x49, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0x0784924f, 0xe296, 0x11d4, {0x9a, 0x49, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_DRIVER_DIAGNOSTICS_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ebc/Ebc.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ebc/Ebc.h
index 4db26f59de..6233208315 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ebc/Ebc.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ebc/Ebc.h
@@ -24,7 +24,7 @@ Abstract:
 

 #define EFI_EBC_INTERPRETER_PROTOCOL_GUID \

   { \

-    0x13AC6DD1, 0x73D0, 0x11D4, 0xB0, 0x6B, 0x00, 0xAA, 0x00, 0xBD, 0x6D, 0xE7 \

+    0x13AC6DD1, 0x73D0, 0x11D4, {0xB0, 0x6B, 0x00, 0xAA, 0x00, 0xBD, 0x6D, 0xE7} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidActive/EdidActive.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidActive/EdidActive.h
index 50b325dd3b..d2618d0b03 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidActive/EdidActive.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidActive/EdidActive.h
@@ -26,7 +26,7 @@ Abstract:
 

 #define EFI_EDID_ACTIVE_PROTOCOL_GUID \

   { \

-    0xbd8c1056, 0x9f36, 0x44ec, 0x92, 0xa8, 0xa6, 0x33, 0x7f, 0x81, 0x79, 0x86 \

+    0xbd8c1056, 0x9f36, 0x44ec, {0x92, 0xa8, 0xa6, 0x33, 0x7f, 0x81, 0x79, 0x86} \

   }

 

 typedef struct {

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidDiscovered/EdidDiscovered.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidDiscovered/EdidDiscovered.h
index 36061f66f8..d8b8910b56 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidDiscovered/EdidDiscovered.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidDiscovered/EdidDiscovered.h
@@ -27,7 +27,7 @@ Abstract:
 

 #define EFI_EDID_DISCOVERED_PROTOCOL_GUID \

   { \

-    0x1c0c34f6, 0xd380, 0x41fa, 0xa0, 0x49, 0x8a, 0xd0, 0x6c,0x1a, 0x66, 0xaa \

+    0x1c0c34f6, 0xd380, 0x41fa, {0xa0, 0x49, 0x8a, 0xd0, 0x6c,0x1a, 0x66, 0xaa} \

   }

 

 typedef struct {

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidOverride/EdidOverride.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidOverride/EdidOverride.h
index 0f6b9c0dd1..b7db74ad8f 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidOverride/EdidOverride.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidOverride/EdidOverride.h
@@ -30,7 +30,7 @@ Abstract:
 

 #define EFI_EDID_OVERRIDE_PROTOCOL_GUID \

   { \

-    0x48ecb431, 0xfb72, 0x45c0, 0xa9, 0x22, 0xf4, 0x58, 0xfe, 0x4, 0xb, 0xd5 \

+    0x48ecb431, 0xfb72, 0x45c0, {0xa9, 0x22, 0xf4, 0x58, 0xfe, 0x4, 0xb, 0xd5} \

   }

 

 typedef struct _EFI_EDID_OVERRIDE_PROTOCOL EFI_EDID_OVERRIDE_PROTOCOL;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiNetworkInterfaceIdentifier/EfiNetworkInterfaceIdentifier.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiNetworkInterfaceIdentifier/EfiNetworkInterfaceIdentifier.h
index 8423c1771d..628b0b7697 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiNetworkInterfaceIdentifier/EfiNetworkInterfaceIdentifier.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiNetworkInterfaceIdentifier/EfiNetworkInterfaceIdentifier.h
@@ -27,11 +27,11 @@ Revision history:
 

 #define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_GUID \

   { \

-    0xE18541CD, 0xF755, 0x4f73, 0x92, 0x8D, 0x64, 0x3C, 0x8A, 0x79, 0xB2, 0x29 \

+    0xE18541CD, 0xF755, 0x4f73, {0x92, 0x8D, 0x64, 0x3C, 0x8A, 0x79, 0xB2, 0x29} \

   }

 #define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_GUID_31 \

   { \

-    0x1ACED566, 0x76ED, 0x4218, 0xBC, 0x81, 0x76, 0x7F, 0x1F, 0x97, 0x7A, 0x89 \

+    0x1ACED566, 0x76ED, 0x4218, {0xBC, 0x81, 0x76, 0x7F, 0x1F, 0x97, 0x7A, 0x89} \

   }

 

 #define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION    0x00010000

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileInfo/FileInfo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileInfo/FileInfo.h
index 6400c0fcf7..995064ba67 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileInfo/FileInfo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileInfo/FileInfo.h
@@ -30,7 +30,7 @@ Abstract:
 

 #define EFI_FILE_INFO_ID \

   { \

-    0x9576e92, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \

+    0x9576e92, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \

   }

 

 typedef struct {

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileSystemInfo/FileSystemInfo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileSystemInfo/FileSystemInfo.h
index fd3c737a9b..a63b7b3d49 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileSystemInfo/FileSystemInfo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileSystemInfo/FileSystemInfo.h
@@ -25,7 +25,7 @@ Abstract:
 

 #define EFI_FILE_SYSTEM_INFO_ID_GUID \

   { \

-    0x9576e93, 0x6d3f, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \

+    0x9576e93, 0x6d3f, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \

   }

 

 typedef struct {

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileSystemVolumeLabelInfo/FileSystemVolumeLabelInfo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileSystemVolumeLabelInfo/FileSystemVolumeLabelInfo.h
index a831d3a35c..42c9666958 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileSystemVolumeLabelInfo/FileSystemVolumeLabelInfo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/FileSystemVolumeLabelInfo/FileSystemVolumeLabelInfo.h
@@ -24,7 +24,7 @@ Abstract:
 

 #define EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID_GUID \

   { \

-    0xDB47D7D3, 0xFE81, 0x11d3, 0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D \

+    0xDB47D7D3, 0xFE81, 0x11d3, {0x9A, 0x35, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D} \

   }

 

 typedef struct {

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/FormBrowser2/FormBrowser2.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/FormBrowser2/FormBrowser2.h
index f762447cb2..055fef154a 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/FormBrowser2/FormBrowser2.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/FormBrowser2/FormBrowser2.h
@@ -26,7 +26,7 @@ Abstract:
 

 #define EFI_FORM_BROWSER2_PROTOCOL_GUID \

   { \

-    0xb9d4c360, 0xbcfb, 0x4f9b, 0x92, 0x98, 0x53, 0xc1, 0x36, 0x98, 0x22, 0x58 \

+    0xb9d4c360, 0xbcfb, 0x4f9b, {0x92, 0x98, 0x53, 0xc1, 0x36, 0x98, 0x22, 0x58} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/GraphicsOutput/GraphicsOutput.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/GraphicsOutput/GraphicsOutput.h
index b7e369fc3e..054af0f225 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/GraphicsOutput/GraphicsOutput.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/GraphicsOutput/GraphicsOutput.h
@@ -28,7 +28,7 @@ Abstract:
 

 #define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \

   { \

-    0x9042a9de, 0x23dc, 0x4a38, 0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a \

+    0x9042a9de, 0x23dc, 0x4a38, {0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a} \

   }

 

 typedef struct _EFI_GRAPHICS_OUTPUT_PROTOCOL EFI_GRAPHICS_OUTPUT_PROTOCOL;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigAccess/HiiConfigAccess.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigAccess/HiiConfigAccess.h
index c64ae33f20..6be808025b 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigAccess/HiiConfigAccess.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigAccess/HiiConfigAccess.h
@@ -26,7 +26,7 @@ Abstract:
 

 #define EFI_HII_CONFIG_ACCESS_PROTOCOL_GUID \

   { \

-    0x330d4706, 0xf2a0, 0x4e4f, 0xa3, 0x69, 0xb6, 0x6f, 0xa8, 0xd5, 0x43, 0x85 \

+    0x330d4706, 0xf2a0, 0x4e4f, {0xa3, 0x69, 0xb6, 0x6f, 0xa8, 0xd5, 0x43, 0x85} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigRouting/HiiConfigRouting.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigRouting/HiiConfigRouting.h
index 8357a1fb04..1464de50e7 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigRouting/HiiConfigRouting.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigRouting/HiiConfigRouting.h
@@ -26,7 +26,7 @@ Abstract:
 

 #define EFI_HII_CONFIG_ROUTING_PROTOCOL_GUID \

   { \

-    0x587e72d7, 0xcc50, 0x4f79, 0x82, 0x09, 0xca, 0x29, 0x1f, 0xc1, 0xa1, 0x0f \

+    0x587e72d7, 0xcc50, 0x4f79, {0x82, 0x09, 0xca, 0x29, 0x1f, 0xc1, 0xa1, 0x0f} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiDatabase/HiiDatabase.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiDatabase/HiiDatabase.h
index ef8e77d0d5..e8a190627f 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiDatabase/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiDatabase/HiiDatabase.h
@@ -34,12 +34,12 @@ Revision History
 

 #define EFI_HII_DATABASE_PROTOCOL_GUID \

   { \

-    0xef9fc172, 0xa1b2, 0x4693, 0xb3, 0x27, 0x6d, 0x32, 0xfc, 0x41, 0x60, 0x42 \

+    0xef9fc172, 0xa1b2, 0x4693, {0xb3, 0x27, 0x6d, 0x32, 0xfc, 0x41, 0x60, 0x42} \

   }

 

 #define EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID \

   { \

-    0x14982a4f, 0xb0ed, 0x45b8, 0xa8, 0x11, 0x5a, 0x7a, 0x9b, 0xc2, 0x32, 0xdf \

+    0x14982a4f, 0xb0ed, 0x45b8, {0xa8, 0x11, 0x5a, 0x7a, 0x9b, 0xc2, 0x32, 0xdf} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_HII_DATABASE_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiFont/HiiFont.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiFont/HiiFont.h
index 26d1d36be4..4666ad7a37 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiFont/HiiFont.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiFont/HiiFont.h
@@ -35,7 +35,7 @@ Revision History
 

 #define EFI_HII_FONT_PROTOCOL_GUID \

   { \

-    0xe9ca4775, 0x8657, 0x47fc, 0x97, 0xe7, 0x7e, 0xd6, 0x5a, 0x8, 0x43, 0x24 \

+    0xe9ca4775, 0x8657, 0x47fc, {0x97, 0xe7, 0x7e, 0xd6, 0x5a, 0x8, 0x43, 0x24} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_HII_FONT_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h
index 7359c89522..3f56daf0b7 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h
@@ -34,7 +34,7 @@ Revision History
 //

 #define EFI_HII_IMAGE_PROTOCOL_GUID \

   { \

-    0x31a6406a, 0x6bdf, 0x4e46, 0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 \

+    0x31a6406a, 0x6bdf, 0x4e46, {0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_HII_IMAGE_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiString/HiiString.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiString/HiiString.h
index 1e061ebe67..0a66841201 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiString/HiiString.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiString/HiiString.h
@@ -33,7 +33,7 @@ Revision History
 //

 #define EFI_HII_STRING_PROTOCOL_GUID \

   { \

-    0xfd96974, 0x23aa, 0x4cdc, 0xb9, 0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a \

+    0xfd96974, 0x23aa, 0x4cdc, {0xb9, 0xcb, 0x98, 0xd1, 0x77, 0x50, 0x32, 0x2a} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_HII_STRING_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/IScsiInitiatorName/IScsiInitiatorName.c b/EdkCompatibilityPkg/Foundation/Efi/Protocol/IScsiInitiatorName/IScsiInitiatorName.c
index d268b43278..527bf0ec71 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/IScsiInitiatorName/IScsiInitiatorName.c
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/IScsiInitiatorName/IScsiInitiatorName.c
@@ -24,4 +24,4 @@ Revision History
 #include EFI_PROTOCOL_DEFINITION (IScsiInitiatorName)

 

 EFI_GUID gEfiIScsiInitiatorNameProtocolGuid = EFI_ISCSI_INITIATOR_NAME_PROTOCOL_GUID;

-EFI_GUID_STRING(&gEfiIScsiInitiatorNameProtocolGuid, "ISCSI Initiator Name Protocol", "UEFI 2.0 ISCSI Initiator Name Protocol");
\ No newline at end of file
+EFI_GUID_STRING(&gEfiIScsiInitiatorNameProtocolGuid, "ISCSI Initiator Name Protocol", "UEFI 2.0 ISCSI Initiator Name Protocol");

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4/Ip4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4/Ip4.h
index 446108e12e..bea6b0a48e 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4/Ip4.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4/Ip4.h
@@ -29,10 +29,10 @@ Abstract:
 //GUID definitions

 //

 #define EFI_IP4_SERVICE_BINDING_PROTOCOL_GUID \

-   {0xc51711e7, 0xb4bf, 0x404a, 0xbf, 0xb8, 0x0a, 0x04, 0x8e, 0xf1, 0xff, 0xe4}

+   {0xc51711e7, 0xb4bf, 0x404a, {0xbf, 0xb8, 0x0a, 0x04, 0x8e, 0xf1, 0xff, 0xe4}}

 

 #define EFI_IP4_PROTOCOL_GUID \

-   {0x41d94cd2, 0x35b6, 0x455a, 0x82, 0x58, 0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd}

+   {0x41d94cd2, 0x35b6, 0x455a, {0x82, 0x58, 0xd4, 0xe5, 0x13, 0x34, 0xaa, 0xdd}}

 

 EFI_FORWARD_DECLARATION (EFI_IP4_PROTOCOL);

 

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4Config/Ip4Config.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4Config/Ip4Config.h
index a77a2375c0..bfaf6bd4f3 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4Config/Ip4Config.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4Config/Ip4Config.h
@@ -23,7 +23,7 @@ Abstract:
 #include EFI_PROTOCOL_DEFINITION (Ip4)

 

 #define EFI_IP4_CONFIG_PROTOCOL_GUID \

-  { 0x3b95aa31, 0x3793, 0x434b, 0x86, 0x67, 0xc8, 0x07, 0x08, 0x92, 0xe0, 0x5e }

+  { 0x3b95aa31, 0x3793, 0x434b, {0x86, 0x67, 0xc8, 0x07, 0x08, 0x92, 0xe0, 0x5e} }

 

 EFI_FORWARD_DECLARATION (EFI_IP4_CONFIG_PROTOCOL);

 

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadFile/LoadFile.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadFile/LoadFile.h
index a7d5027e49..84b2bdb3e0 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadFile/LoadFile.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadFile/LoadFile.h
@@ -30,7 +30,7 @@ Abstract:
 

 #define LOAD_FILE_PROTOCOL_GUID \

   { \

-    0x56EC3091, 0x954C, 0x11d2, 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B \

+    0x56EC3091, 0x954C, 0x11d2, {0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_LOAD_FILE_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadedImage/LoadedImage.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadedImage/LoadedImage.h
index 07c62f1d17..046e50151f 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadedImage/LoadedImage.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadedImage/LoadedImage.h
@@ -27,7 +27,7 @@ Abstract:
 

 #define EFI_LOADED_IMAGE_PROTOCOL_GUID \

   { \

-    0x5B1B31A1, 0x9562, 0x11d2, 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B \

+    0x5B1B31A1, 0x9562, 0x11d2, {0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ManagedNetwork/ManagedNetwork.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ManagedNetwork/ManagedNetwork.h
index 2704f9bd1e..fa7c86a154 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ManagedNetwork/ManagedNetwork.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ManagedNetwork/ManagedNetwork.h
@@ -26,10 +26,10 @@ Abstract:
 #include EFI_PROTOCOL_DEFINITION (ServiceBinding)

 

 #define EFI_MANAGED_NETWORK_SERVICE_BINDING_PROTOCOL_GUID \

-  { 0xf36ff770, 0xa7e1, 0x42cf, 0x9e, 0xd2, 0x56, 0xf0, 0xf2, 0x71, 0xf4, 0x4c }

+  { 0xf36ff770, 0xa7e1, 0x42cf, {0x9e, 0xd2, 0x56, 0xf0, 0xf2, 0x71, 0xf4, 0x4c} }

 

 #define EFI_MANAGED_NETWORK_PROTOCOL_GUID \

-  { 0x7ab33a91, 0xace5, 0x4326, 0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16 }

+  { 0x7ab33a91, 0xace5, 0x4326, {0xb5, 0x72, 0xe7, 0xee, 0x33, 0xd3, 0x9f, 0x16} }

 

 EFI_FORWARD_DECLARATION (EFI_MANAGED_NETWORK_PROTOCOL);

 

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Mtftp4/Mtftp4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Mtftp4/Mtftp4.h
index e80ce6ad91..7882dc0d5a 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Mtftp4/Mtftp4.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Mtftp4/Mtftp4.h
@@ -25,10 +25,10 @@ Abstract:
 #include EFI_PROTOCOL_DEFINITION(ServiceBinding)

 

 #define EFI_MTFTP4_SERVICE_BINDING_PROTOCOL_GUID \

-    { 0x2FE800BE, 0x8F01, 0x4aa6, 0x94, 0x6B, 0xD7, 0x13, 0x88, 0xE1, 0x83, 0x3F }

+    { 0x2FE800BE, 0x8F01, 0x4aa6, {0x94, 0x6B, 0xD7, 0x13, 0x88, 0xE1, 0x83, 0x3F} }

 

 #define EFI_MTFTP4_PROTOCOL_GUID \

-    { 0x78247c57, 0x63db, 0x4708, 0x99, 0xc2, 0xa8, 0xb4, 0xa9, 0xa6, 0x1f, 0x6b }

+    { 0x78247c57, 0x63db, 0x4708, {0x99, 0xc2, 0xa8, 0xb4, 0xa9, 0xa6, 0x1f, 0x6b} }

 

 EFI_FORWARD_DECLARATION (EFI_MTFTP4_PROTOCOL);

 EFI_FORWARD_DECLARATION (EFI_MTFTP4_TOKEN);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciIo/PciIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciIo/PciIo.h
index 49a381125a..54b33d8c9a 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciIo/PciIo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciIo/PciIo.h
@@ -29,7 +29,7 @@ Revision History
 //

 #define EFI_PCI_IO_PROTOCOL_GUID \

   { \

-    0x4cf5b200, 0x68b8, 0x4ca5, 0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a \

+    0x4cf5b200, 0x68b8, 0x4ca5, {0x9e, 0xec, 0xb2, 0x3e, 0x3f, 0x50, 0x2, 0x9a} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_PCI_IO_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciRootBridgeIo/PciRootBridgeIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciRootBridgeIo/PciRootBridgeIo.h
index 2a0bcd1954..2f748812de 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciRootBridgeIo/PciRootBridgeIo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciRootBridgeIo/PciRootBridgeIo.h
@@ -28,7 +28,7 @@ Abstract:
 

 #define EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID \

   { \

-    0x2f707ebb, 0x4a1a, 0x11d4, 0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0x2f707ebb, 0x4a1a, 0x11d4, {0x9a, 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformDriverOverride/PlatformDriverOverride.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformDriverOverride/PlatformDriverOverride.h
index 58d531889b..1f9fda8b5c 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformDriverOverride/PlatformDriverOverride.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformDriverOverride/PlatformDriverOverride.h
@@ -27,7 +27,7 @@ Abstract:
 //

 #define EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL_GUID \

   { \

-    0x6b30c738, 0xa391, 0x11d4, 0x9a, 0x3b, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0x6b30c738, 0xa391, 0x11d4, {0x9a, 0x3b, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCode/PxeBaseCode.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCode/PxeBaseCode.h
index d3e443ee32..52f97a2265 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCode/PxeBaseCode.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCode/PxeBaseCode.h
@@ -26,7 +26,7 @@ Abstract:
 //

 #define EFI_PXE_BASE_CODE_PROTOCOL_GUID \

   { \

-    0x03c4e603, 0xac28, 0x11d3, 0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0x03c4e603, 0xac28, 0x11d3, {0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_PXE_BASE_CODE_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCodeCallBack/PxeBaseCodeCallBack.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCodeCallBack/PxeBaseCodeCallBack.h
index 9e18a6760d..0396bec50d 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCodeCallBack/PxeBaseCodeCallBack.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCodeCallBack/PxeBaseCodeCallBack.h
@@ -27,7 +27,7 @@ Abstract:
 //

 #define EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_GUID \

   { \

-    0x245dca21, 0xfb7b, 0x11d3, 0x8f, 0x01, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b \

+    0x245dca21, 0xfb7b, 0x11d3, {0x8f, 0x01, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ScsiPassThru/ScsiPassThru.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ScsiPassThru/ScsiPassThru.h
index 325c25fc1b..ae8e835271 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ScsiPassThru/ScsiPassThru.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ScsiPassThru/ScsiPassThru.h
@@ -24,7 +24,7 @@ Abstract:
 

 #define EFI_SCSI_PASS_THRU_PROTOCOL_GUID \

   { \

-    0xa59e8fcf, 0xbda0, 0x43bb, 0x90, 0xb1, 0xd3, 0x73, 0x2e, 0xca, 0xa8, 0x77 \

+    0xa59e8fcf, 0xbda0, 0x43bb, {0x90, 0xb1, 0xd3, 0x73, 0x2e, 0xca, 0xa8, 0x77} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SerialIo/SerialIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SerialIo/SerialIo.h
index 5bead18401..b172fa1fc9 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SerialIo/SerialIo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SerialIo/SerialIo.h
@@ -27,7 +27,7 @@ Abstract:
 

 #define EFI_SERIAL_IO_PROTOCOL_GUID \

   { \

-    0xBB25CF6F, 0xF1D4, 0x11D2, 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD \

+    0xBB25CF6F, 0xF1D4, 0x11D2, {0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0xFD} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_SERIAL_IO_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleFileSystem/SimpleFileSystem.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleFileSystem/SimpleFileSystem.h
index f0c772517d..04cfaa5fc7 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleFileSystem/SimpleFileSystem.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleFileSystem/SimpleFileSystem.h
@@ -30,7 +30,7 @@ Abstract:
 

 #define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID \

   { \

-    0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \

+    0x964e5b22, 0x6459, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_SIMPLE_FILE_SYSTEM_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleNetwork/SimpleNetwork.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleNetwork/SimpleNetwork.h
index 75514c63e4..929a475c3e 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleNetwork/SimpleNetwork.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleNetwork/SimpleNetwork.h
@@ -31,7 +31,7 @@ Abstract:
 

 #define EFI_SIMPLE_NETWORK_PROTOCOL_GUID \

   { \

-    0xA19832B9, 0xAC25, 0x11D3, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D \

+    0xA19832B9, 0xAC25, 0x11D3, {0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_SIMPLE_NETWORK_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimplePointer/SimplePointer.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimplePointer/SimplePointer.h
index e286d5d7e3..13d7230a51 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimplePointer/SimplePointer.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimplePointer/SimplePointer.h
@@ -26,7 +26,7 @@ Abstract:
 

 #define EFI_SIMPLE_POINTER_PROTOCOL_GUID \

   { \

-    0x31878c87, 0xb75, 0x11d5, 0x9a, 0x4f, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0x31878c87, 0xb75, 0x11d5, {0x9a, 0x4f, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_SIMPLE_POINTER_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextIn/SimpleTextIn.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextIn/SimpleTextIn.h
index a9b39e991e..0c2b9bf5ed 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextIn/SimpleTextIn.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextIn/SimpleTextIn.h
@@ -27,7 +27,7 @@ Abstract:
 

 #define EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID \

   { \

-    0x387477c1, 0x69c7, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \

+    0x387477c1, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_SIMPLE_TEXT_IN_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h
index 6ce2df4b12..f6f19978a6 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h
@@ -30,7 +30,7 @@ Abstract:
 

 #define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \

   { \

-    0xdd9e7534, 0x7762, 0x4698, 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa\

+    0xdd9e7534, 0x7762, 0x4698, {0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa}\

   }

 

 EFI_FORWARD_DECLARATION (EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextOut/SimpleTextOut.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextOut/SimpleTextOut.h
index 6d54fbc291..8030e28566 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextOut/SimpleTextOut.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextOut/SimpleTextOut.h
@@ -29,7 +29,7 @@ Abstract:
 

 #define EFI_SIMPLE_TEXT_OUT_PROTOCOL_GUID \

   { \

-    0x387477c2, 0x69c7, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b \

+    0x387477c2, 0x69c7, 0x11d2, {0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x3b} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_SIMPLE_TEXT_OUT_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Tcp4/Tcp4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Tcp4/Tcp4.h
index 786c6d3766..00c7238025 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Tcp4/Tcp4.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Tcp4/Tcp4.h
@@ -27,14 +27,14 @@ Abstract:
 

 #define EFI_TCP4_SERVICE_BINDING_PROTOCOL_GUID \

   { \

-    0x00720665, 0x67EB, 0x4a99, 0xBA, 0xF7, 0xD3, 0xC3, 0x3A, 0x1C, 0x7C, 0xC9 \

+    0x00720665, 0x67EB, 0x4a99, {0xBA, 0xF7, 0xD3, 0xC3, 0x3A, 0x1C, 0x7C, 0xC9} \

   }

 

 extern EFI_GUID gEfiTcp4ServiceBindingProtocolGuid;

 

 #define EFI_TCP4_PROTOCOL_GUID \

   { \

-    0x65530BC7, 0xA359, 0x410f, 0xB0, 0x10, 0x5A, 0xAD, 0xC7, 0xEC, 0x2B, 0x62 \

+    0x65530BC7, 0xA359, 0x410f, {0xB0, 0x10, 0x5A, 0xAD, 0xC7, 0xEC, 0x2B, 0x62} \

   }

 

 extern EFI_GUID gEfiTcp4ProtocolGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Udp4/Udp4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Udp4/Udp4.h
index a741fbe2d9..5a1aa6f0d7 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Udp4/Udp4.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Udp4/Udp4.h
@@ -27,10 +27,10 @@ Abstract:
 //GUID definitions

 //

 #define EFI_UDP4_SERVICE_BINDING_PROTOCOL_GUID \

-  { 0x83f01464, 0x99bd, 0x45e5, 0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6 }

+  { 0x83f01464, 0x99bd, 0x45e5, {0xb3, 0x83, 0xaf, 0x63, 0x05, 0xd8, 0xe9, 0xe6} }

 

 #define EFI_UDP4_PROTOCOL_GUID \

-  { 0x3ad9df29, 0x4501, 0x478d, 0xb1, 0xf8, 0x7f, 0x7f, 0xe7, 0x0e, 0x50, 0xf3 }

+  { 0x3ad9df29, 0x4501, 0x478d, {0xb1, 0xf8, 0x7f, 0x7f, 0xe7, 0x0e, 0x50, 0xf3} }

 

 typedef struct {

   EFI_HANDLE          InstanceHandle;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaDraw/UgaDraw.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaDraw/UgaDraw.h
index 7ff1555c53..a993f5db25 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaDraw/UgaDraw.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaDraw/UgaDraw.h
@@ -26,7 +26,7 @@ Abstract:
 

 #define EFI_UGA_DRAW_PROTOCOL_GUID \

   { \

-    0x982c298b, 0xf4fa, 0x41cb, 0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39 \

+    0x982c298b, 0xf4fa, 0x41cb, {0xb8, 0x38, 0x77, 0xaa, 0x68, 0x8f, 0xb8, 0x39} \

   }

 

 typedef struct _EFI_UGA_DRAW_PROTOCOL EFI_UGA_DRAW_PROTOCOL;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaIo/UgaIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaIo/UgaIo.h
index 585140ee44..8b23325093 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaIo/UgaIo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaIo/UgaIo.h
@@ -26,7 +26,7 @@ Abstract:
 

 #define EFI_UGA_IO_PROTOCOL_GUID \

   { \

-    0x61a4d49e, 0x6f68, 0x4f1b, 0xb9, 0x22, 0xa8, 0x6e, 0xed, 0xb, 0x7, 0xa2 \

+    0x61a4d49e, 0x6f68, 0x4f1b, {0xb9, 0x22, 0xa8, 0x6e, 0xed, 0xb, 0x7, 0xa2} \

   }

 

 typedef struct _EFI_UGA_IO_PROTOCOL EFI_UGA_IO_PROTOCOL;

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation/UnicodeCollation.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation/UnicodeCollation.h
index ac89bfc130..28a15a2637 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation/UnicodeCollation.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation/UnicodeCollation.h
@@ -24,12 +24,12 @@ Abstract:
 

 #define EFI_UNICODE_COLLATION_PROTOCOL_GUID \

   { \

-    0x1d85cd7f, 0xf43d, 0x11d2, 0x9a, 0xc, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d \

+    0x1d85cd7f, 0xf43d, 0x11d2, {0x9a, 0xc, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d} \

   }

 

 #define EFI_UNICODE_COLLATION2_PROTOCOL_GUID \

   { \

-    0xa4c751fc, 0x23ae, 0x4c3e, 0x92, 0xe9, 0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49 \

+    0xa4c751fc, 0x23ae, 0x4c3e, {0x92, 0xe9, 0x49, 0x64, 0xcf, 0x63, 0xf3, 0x49} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_UNICODE_COLLATION_PROTOCOL);

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbHostController/UsbHostController.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbHostController/UsbHostController.h
index 0a2391ed4c..774900fdec 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbHostController/UsbHostController.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbHostController/UsbHostController.h
@@ -26,7 +26,7 @@ Abstract:
 

 #define EFI_USB_HC_PROTOCOL_GUID \

   { \

-    0xf5089266, 0x1aa0, 0x4953, 0x97, 0xd8, 0x56, 0x2f, 0x8a, 0x73, 0xb5, 0x19 \

+    0xf5089266, 0x1aa0, 0x4953, {0x97, 0xd8, 0x56, 0x2f, 0x8a, 0x73, 0xb5, 0x19} \

   }

 

 //

@@ -209,7 +209,7 @@ extern EFI_GUID gEfiUsbHcProtocolGuid;
 

 #define EFI_USB2_HC_PROTOCOL_GUID \

   { \

-    0x3e745226, 0x9818, 0x45b6, 0xa2, 0xac, 0xd7, 0xcd, 0xe, 0x8b, 0xa2, 0xbc \

+    0x3e745226, 0x9818, 0x45b6, {0xa2, 0xac, 0xd7, 0xcd, 0xe, 0x8b, 0xa2, 0xbc} \

   }

 

 //

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbIo/UsbIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbIo/UsbIo.h
index 7b9823c647..950698341d 100644
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbIo/UsbIo.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbIo/UsbIo.h
@@ -31,7 +31,7 @@ Revision History
 //

 #define EFI_USB_IO_PROTOCOL_GUID \

   { \

-    0x2B2F68D6, 0x0CD2, 0x44cf, 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 \

+    0x2B2F68D6, 0x0CD2, 0x44cf, {0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75} \

   }

 

 EFI_FORWARD_DECLARATION (EFI_USB_IO_PROTOCOL);