Fix some GCC build errors.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/Platform/BroxtonPlatformPkg/Common/Include/Guid/SetupVariable.h b/Platform/BroxtonPlatformPkg/Common/Include/Guid/SetupVariable.h
index fe95ee7c9c..c6ced46167 100644
--- a/Platform/BroxtonPlatformPkg/Common/Include/Guid/SetupVariable.h
+++ b/Platform/BroxtonPlatformPkg/Common/Include/Guid/SetupVariable.h
@@ -1,7 +1,7 @@
 /** @file

   Header file for Setup Variable.

 

-  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -21,29 +21,29 @@
 //

 // {EC87D643-EBA4-4bb5-A1E5-3F3E36B20DA9}

 //

-#define SYSTEM_CONFIGURATION_GUID  { 0xec87d643, 0xeba4, 0x4bb5, 0xa1, 0xe5, 0x3f, 0x3e, 0x36, 0xb2, 0xd, 0xa9 }

+#define SYSTEM_CONFIGURATION_GUID  { 0xec87d643, 0xeba4, 0x4bb5, {0xa1, 0xe5, 0x3f, 0x3e, 0x36, 0xb2, 0xd, 0xa9 }}

 

-#define ROOT_SECURITY_GUID  { 0xd387d688, 0xeba4, 0x45b5, 0xa1, 0xe5, 0x3f, 0x3e, 0x36, 0xb2, 0xd, 0x37 }

+#define ROOT_SECURITY_GUID  { 0xd387d688, 0xeba4, 0x45b5, {0xa1, 0xe5, 0x3f, 0x3e, 0x36, 0xb2, 0xd, 0x37} }

 

 //

 // {6936B3BD-4350-46d9-8940-1FA20961AEB1}

 //

-#define SYSTEM_ROOT_MAIN_GUID  { 0x6936b3bd, 0x4350, 0x46d9, 0x89, 0x40, 0x1f, 0xa2, 0x9, 0x61, 0xae, 0xb1 }

+#define SYSTEM_ROOT_MAIN_GUID  { 0x6936b3bd, 0x4350, 0x46d9, {0x89, 0x40, 0x1f, 0xa2, 0x9, 0x61, 0xae, 0xb1} }

 

 //

 // {21FEE8DB-0D29-477e-B5A9-96EB343BA99C}

 //

-#define ADDITIONAL_SYSTEM_INFO_GUID  {  0x21fee8db, 0xd29, 0x477e, 0xb5, 0xa9, 0x96, 0xeb, 0x34, 0x3b, 0xa9, 0x9c }

+#define ADDITIONAL_SYSTEM_INFO_GUID  {  0x21fee8db, 0xd29, 0x477e, {0xb5, 0xa9, 0x96, 0xeb, 0x34, 0x3b, 0xa9, 0x9c }}

 

 //

 // {EC87D643-EBA4-4BB5-A1E5-3F3E36B20DA9}

 //

-#define SETUP_GUID  { 0xEC87D643, 0xEBA4, 0x4BB5, 0xA1, 0xE5, 0x3F, 0x3E, 0x36, 0xB2, 0x0D, 0xA9 }

+#define SETUP_GUID  { 0xEC87D643, 0xEBA4, 0x4BB5, {0xA1, 0xE5, 0x3F, 0x3E, 0x36, 0xB2, 0x0D, 0xA9 }}

 

 //

 // {1B838190-4625-4ead-ABC9-CD5E6AF18FE0}

 //

-#define EFI_HII_EXPORT_DATABASE_GUID { 0x1b838190, 0x4625, 0x4ead, 0xab, 0xc9, 0xcd, 0x5e, 0x6a, 0xf1, 0x8f, 0xe0 }

+#define EFI_HII_EXPORT_DATABASE_GUID { 0x1b838190, 0x4625, 0x4ead, {0xab, 0xc9, 0xcd, 0x5e, 0x6a, 0xf1, 0x8f, 0xe0} }

 

 #define PASSWORD_MAX_SIZE            20

 #define MAX_CUSTOM_VID_TABLE_STATES  6

@@ -80,7 +80,6 @@
 #define EFI_HDD_WARNING_OFF   0x00

 #define EFI_CD_WARNING_OFF    0x00

 #define EFI_SMART_WARNING_OFF 0x00

-#define OFFSET_0              0x00

 

 #ifndef VFRCOMPILE

   extern EFI_GUID gEfiSetupVariableGuid;