summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>2008-04-18 09:22:58 +0000
committerqwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>2008-04-18 09:22:58 +0000
commit102e727273b535d9a3c133ed6fbf5ae7ff5abea2 (patch)
treef781f02c47b5fd745d89739e0e88ce320e4a5521
parent0f9d26a7dda4a5852393152577c56b3def4544d4 (diff)
downloadedk2-platforms-102e727273b535d9a3c133ed6fbf5ae7ff5abea2.tar.xz
rename EFI_HII_UPDATE_DATA in FrameworkHii.h to FRAMEWORK_EFI_HII_UPDATE_DATA as it is a duplicated definition with IfrSupportLib.h
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5097 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--IntelFrameworkPkg/Include/Protocol/FrameworkHii.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
index 0caf7adfcf..b37688b89b 100644
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
@@ -171,7 +171,6 @@ typedef struct {
//
} EFI_HII_EXPORT_TABLE;
-#define EFI_HII_UPDATE_DATA FRAMEWORK_EFI_HII_UPDATE_DATA
typedef struct {
BOOLEAN FormSetUpdate; // If TRUE, next variable is significant
EFI_PHYSICAL_ADDRESS FormCallbackHandle; // If not 0, will update Formset with this info
@@ -180,7 +179,7 @@ typedef struct {
STRING_REF FormTitle; // If not 0, will update Form with this info
UINT16 DataCount; // The number of Data entries in this structure
UINT8 *Data; // An array of 1+ op-codes, specified by DataCount
-} EFI_HII_UPDATE_DATA;
+} FRAMEWORK_EFI_HII_UPDATE_DATA;
//
// String attributes
@@ -711,7 +710,7 @@ EFI_STATUS
IN FRAMEWORK_EFI_HII_HANDLE Handle,
IN EFI_FORM_LABEL Label,
IN BOOLEAN AddData,
- IN EFI_HII_UPDATE_DATA *Data
+ IN FRAMEWORK_EFI_HII_UPDATE_DATA *Data
);
/**