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

[mirror_edk2.git] / MdePkg / Include / Uefi / UefiSpec.h

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index c2f52d2769c33c2d22c2e5f4328356136d4dbca9..b1fdb56e738ef62363cca75f00195d005b80f61f 100644 (file)
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -1538,14 +1538,14 @@ EFI_STATUS
 //\r
 // EFI Runtime Services Table\r
 //\r
-#define EFI_SYSTEM_TABLE_SIGNATURE      0x5453595320494249\r
+#define EFI_SYSTEM_TABLE_SIGNATURE      0x5453595320494249ULL\r
 #define EFI_SYSTEM_TABLE_REVISION       ((2<<16) | (10))\r
 #define EFI_2_10_SYSTEM_TABLE_REVISION  ((2<<16) | (10))\r
 #define EFI_2_00_SYSTEM_TABLE_REVISION  ((2<<16) | (00))\r
 #define EFI_1_10_SYSTEM_TABLE_REVISION  ((1<<16) | (10))\r
 #define EFI_1_02_SYSTEM_TABLE_REVISION  ((1<<16) | (02))\r
 \r
-#define EFI_RUNTIME_SERVICES_SIGNATURE  0x56524553544e5552\r
+#define EFI_RUNTIME_SERVICES_SIGNATURE  0x56524553544e5552ULL\r
 #define EFI_RUNTIME_SERVICES_REVISION   EFI_2_10_SYSTEM_TABLE_REVISION\r
 \r
 typedef struct {\r
@@ -1591,7 +1591,7 @@ typedef struct {
 } EFI_RUNTIME_SERVICES;\r
 \r
 \r
-#define EFI_BOOT_SERVICES_SIGNATURE   0x56524553544f4f42\r
+#define EFI_BOOT_SERVICES_SIGNATURE   0x56524553544f4f42ULL\r
 #define EFI_BOOT_SERVICES_REVISION    EFI_2_10_SYSTEM_TABLE_REVISION\r
 \r
 typedef struct {\r
@@ -1740,13 +1740,13 @@ typedef union {
     UINT32  InputKeyCount   : 2;\r
   }       Options;\r
   UINT32  PackedValue;\r
-} EFI_KEY_DATA;\r
+} HOT_KEY_EFI_KEY_DATA;\r
 \r
 typedef struct {\r
-  EFI_KEY_DATA      KeyOptions;\r
-  UINT32            BootOptionCrc;\r
-  UINT16            BootOption;\r
-//EFI_INPUT_KEY  Keys[];\r
+  HOT_KEY_EFI_KEY_DATA  KeyOptions;\r
+  UINT32                BootOptionCrc;\r
+  UINT16                BootOption;\r
+//EFI_INPUT_KEY         Keys[];\r
 } EFI_KEY_OPTION;\r
 \r
 #define EFI_KEY_OPTION_SHIFT     0x00000001\r