From: AJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 11 Oct 2007 17:12:14 +0000 (+0000)
Subject: UEFI Specification has a name conflict. Change the Variable definitions to not confli... 
X-Git-Tag: edk2-stable201903~21926
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=0d332fdca8dafa1cc229a0703f391f40891b7fe2;ds=sidebyside

UEFI Specification has a name conflict. Change the Variable definitions to not conflict with the SimpleTextInEx definitions.

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

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 050a6ec27c..b1fdb56e73 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -1740,13 +1740,13 @@ typedef union {
     UINT32  InputKeyCount   : 2;
   }       Options;
   UINT32  PackedValue;
-} EFI_KEY_DATA;
+} HOT_KEY_EFI_KEY_DATA;
 
 typedef struct {
-  EFI_KEY_DATA      KeyOptions;
-  UINT32            BootOptionCrc;
-  UINT16            BootOption;
-//EFI_INPUT_KEY  Keys[];
+  HOT_KEY_EFI_KEY_DATA  KeyOptions;
+  UINT32                BootOptionCrc;
+  UINT16                BootOption;
+//EFI_INPUT_KEY         Keys[];
 } EFI_KEY_OPTION;
 
 #define EFI_KEY_OPTION_SHIFT     0x00000001