Fix the build bugs for these three files.

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
index b05378901904e6424c77c9741ed31172951d40cf..b0010a6f9beb85edfcc547e802ffe1bd3a19c12c 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
@@ -277,7 +277,7 @@ GetFormSetGuid (
     switch (OpCode->OpCode) {\r
     case EFI_IFR_FORM_SET_OP:\r
       FormSet = (EFI_IFR_FORM_SET *) OpCode;\r
-      CopyGuid (FormSetGuid, &FormSet->Guid);\r
+      CopyMem (FormSetGuid, &FormSet->Guid, sizeof (EFI_GUID));\r
       return;\r
       \r
       default:\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
index 2c5a3201e75968de359f902219c4290c6e7c5ea3..154297b61e0c36bb5c441051977f5b460f8dbf99 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
@@ -87,7 +87,7 @@ Abstract:
 //\r
 // debug print level\r
 //\r
-#define EDKII_GLUE_DebugPrintErrorLevel         EFI_D_ERROR\r
+#define EDKII_GLUE_DebugPrintErrorLevel         EFI_D_ERROR|EFI_D_INFO\r
 \r
 //\r
 // debug propery mask\r
@@ -96,7 +96,6 @@ Abstract:
                                                   | DEBUG_PROPERTY_DEBUG_PRINT_ENABLED               \\r
                                                   | DEBUG_PROPERTY_DEBUG_CODE_ENABLED                \\r
                                                   | DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED              \\r
-                                                  | DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED         \\r
                                                   | DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED           \\r
                                                )\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
index 0526d22073f037f81ffc0bbaf244ae30f731a56a..ffc105a087595aed5726f772ab0c634f6fe4577e 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
@@ -85,7 +85,10 @@ InternalReportStatusCode (
     //\r
     return (gStatusCode->ReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data);\r
   } else {\r
+#if (EFI_SPECIFICATION_VERSION < 0x00020000)\r
     return (gRT->ReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data);\r
+#endif\r
+    return EFI_UNSUPPORTED;\r
   }\r
 \r
 }\r