summaryrefslogtreecommitdiff
path: root/EdkCompatibilityPkg
diff options
context:
space:
mode:
authorHao Wu <hao.a.wu@intel.com>2015-07-07 03:05:18 +0000
committerhwu1225 <hwu1225@Edk2>2015-07-07 03:05:18 +0000
commitde03a274090594a38e94e2514d7b9c202e1e1348 (patch)
tree94ea084f9cee9e0ef3fdf1cc28c72eb8ac563f5a /EdkCompatibilityPkg
parent80becbc989d41e0f1a42494d06ff3d5c332d9c38 (diff)
downloadedk2-platforms-de03a274090594a38e94e2514d7b9c202e1e1348.tar.xz
EdkCompatibilityPkg: Remove gZeroGuid def in FrameworkHiiOnUefiHiiThunk
MdeModulePkg has defined gZeroGuid in 'Guid/ZeroGuid.h', therefore, the gZeroGuid defined in Compatibility/FrameworkHiiOnUefiHiiThunk is redundent. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu <hao.a.wu@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17846 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkCompatibilityPkg')
-rw-r--r--EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf1
-rw-r--r--EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
index 2b5b422520..5e13683087 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/FrameworkHiiOnUefiHiiThunk.inf
@@ -86,6 +86,7 @@
gEfiIfrFrameworkGuid
gEfiHiiStandardFormGuid
gFrameworkBdsFrontPageFormsetGuid
+ gZeroGuid ## SOMETIMES_CONSUMES ## GUID
[Protocols]
gEfiHiiImageProtocolGuid
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
index 091b00d084..f6d97f6344 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
@@ -2,7 +2,7 @@
This file contains the keyboard processing code to the HII database.
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2015, 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
which accompanies this distribution. The full text of the license may be found at
@@ -17,8 +17,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include "HiiDatabase.h"
#include "HiiHandle.h"
#include <Library/DebugLib.h>
+#include <Guid/ZeroGuid.h>
-CONST EFI_GUID gZeroGuid = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}};
CONST CHAR16 FrameworkReservedVarstoreName[] = FRAMEWORK_RESERVED_VARSTORE_NAME;
/**