Clean ECP for build failure.

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

3 files changed, 8 insertions, 7 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
index c302cf56f0..0078082b7d 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
@@ -20,13 +20,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // This structure is only intended to be used in this file.

 //

-#pragma pack(push, 1)

+#pragma pack(1)

 typedef struct {

   EFI_HII_PACK_HEADER            PackageHeader;

   FRAMEWORK_EFI_IFR_FORM_SET     FormSet;

   FRAMEWORK_EFI_IFR_END_FORM_SET EndFormSet;

 } FW_HII_FORMSET_TEMPLATE;

-#pragma pack(pop)

+#pragma pack()

 

 FW_HII_FORMSET_TEMPLATE FormSetTemplate = {

   {

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
index d9b6577adf..6b7810eb92 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h
@@ -64,12 +64,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define FRAMEWORK_RESERVED_VARSTORE_ID 0x0001

 

 

-#pragma pack (push, 1)

+#pragma pack (1)

 typedef struct {

   EFI_HII_PACK_HEADER     FrameworkPackageHeader;

   EFI_HII_PACKAGE_HEADER  PackageHeader;

 } TIANO_AUTOGEN_PACKAGES_HEADER;

-#pragma pack (pop)

+#pragma pack ()

 

 #define HII_THUNK_PRIVATE_DATA_FROM_THIS(Record)  CR(Record, HII_THUNK_PRIVATE_DATA, Hii, HII_THUNK_PRIVATE_DATA_SIGNATURE)

 #define HII_THUNK_PRIVATE_DATA_SIGNATURE            EFI_SIGNATURE_32 ('H', 'i', 'I', 'T')

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
index 494a31dc53..3187a94160 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
@@ -22,6 +22,9 @@ BOOLEAN mInFrameworkHiiRemovePack = FALSE;
 BOOLEAN mInFrameworkUpdatePakcage = FALSE;

 UINT64  mGuidCount = 0;

 

+EFI_GUID mGuidBase = { 0x14f95e01, 0xd562, 0x432e, { 0x84, 0x4a, 0x95, 0xa4, 0x39, 0x5, 0x10, 0x7e }};

+

+

 

 /**

   Get the number of package IFR and STRING packages in the package list passed in.

@@ -357,9 +360,7 @@ GenerateRandomGuid (
   OUT           EFI_GUID * Guid

   )

 {

-  EFI_GUID        GuidBase = { 0x14f95e01, 0xd562, 0x432e, { 0x84, 0x4a, 0x95, 0xa4, 0x39, 0x5, 0x10, 0x7e }};

-

-  CopyGuid (Guid, &GuidBase);

+  CopyGuid (Guid, &mGuidBase);

 

   mGuidCount++;  

   *((UINT64 *) Guid) = *((UINT64 *) Guid) + mGuidCount;