From 14085cf0712039298fd69682cab17cfd6a649057 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Tue, 16 Sep 2008 07:37:57 +0000 Subject: [PATCH] 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 --- .../Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c | 2 +- .../Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h | 3 +-- .../Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c index b053789019..b0010a6f9b 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c @@ -277,7 +277,7 @@ GetFormSetGuid ( switch (OpCode->OpCode) { case EFI_IFR_FORM_SET_OP: FormSet = (EFI_IFR_FORM_SET *) OpCode; - CopyGuid (FormSetGuid, &FormSet->Guid); + CopyMem (FormSetGuid, &FormSet->Guid, sizeof (EFI_GUID)); return; default: diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h index 2c5a3201e7..154297b61e 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h @@ -87,7 +87,7 @@ Abstract: // // debug print level // -#define EDKII_GLUE_DebugPrintErrorLevel EFI_D_ERROR +#define EDKII_GLUE_DebugPrintErrorLevel EFI_D_ERROR|EFI_D_INFO // // debug propery mask @@ -96,7 +96,6 @@ Abstract: | DEBUG_PROPERTY_DEBUG_PRINT_ENABLED \ | DEBUG_PROPERTY_DEBUG_CODE_ENABLED \ | DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED \ - | DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED \ | DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED \ ) diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c index 0526d22073..ffc105a087 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c @@ -85,7 +85,10 @@ InternalReportStatusCode ( // return (gStatusCode->ReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data); } else { +#if (EFI_SPECIFICATION_VERSION < 0x00020000) return (gRT->ReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data); +#endif + return EFI_UNSUPPORTED; } }