1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EdkIIGlueLib / Include / Common / EdkIIGlueDefinitionChangesDxe.h

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesDxe.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesDxe.h
index 0f2cadd3fc42beb05a491f29c262b40f3a7da2c2..4bcbf9ca621f4873d71006d03346ab4e72568127 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesDxe.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesDxe.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2006, Intel Corporation                                                         \r
+Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -23,7 +23,11 @@ Abstract:
 #ifndef __EDKII_GLUE_DEFINITION_CHANGES_DXE_H__\r
 #define __EDKII_GLUE_DEFINITION_CHANGES_DXE_H__\r
 \r
+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
+#include "TianoHii.h"\r
+#else\r
 #include "EfiInternalFormRepresentation.h"\r
+#endif\r
 \r
 #include "EdkIIGlueDefinitionChangesBase.h"\r
 \r
@@ -59,8 +63,10 @@ typedef EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION         EFI_MISC_SMBIOS_STRUCT_ENCA
 // -------------------\r
 #define gEfiAcpiSupportProtocolGuid                   gEfiAcpiSupportGuid\r
 #define gEfiLoadPeImageProtocolGuid                   gEfiLoadPeImageGuid\r
+#if (EFI_SPECIFICATION_VERSION < 0x0002000A)\r
 #define EFI_GLYPH_NON_SPACING                         GLYPH_NON_SPACING\r
 #define EFI_GLYPH_WIDE                                GLYPH_NON_BREAKING\r
+#endif\r
 #define BOOT_OBJECT_AUTHORIZATION_PARMSET_GUID        BOOT_OBJECT_AUTHORIZATION_PARMSET_GUIDVALUE\r
 #define EFI_EBC_PROTOCOL_GUID                         EFI_EBC_INTERPRETER_PROTOCOL_GUID\r
 #define EFI_FILE_SYSTEM_VOLUME_LABEL_ID               EFI_FILE_SYSTEM_VOLUME_LABEL_INFO_ID_GUID\r
@@ -78,7 +84,9 @@ typedef EFI_MISC_SMBIOS_STRUCT_ENCAPSULATION         EFI_MISC_SMBIOS_STRUCT_ENCA
 //\r
 typedef EFI_VOLUME_OPEN                              EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_OPEN_VOLUME;\r
 typedef EFI_TEXT_OUTPUT_STRING                       EFI_TEXT_STRING;\r
+#if (EFI_SPECIFICATION_VERSION < 0x0002000A)\r
 typedef SCREEN_DESCRIPTOR                            EFI_SCREEN_DESCRIPTOR;\r
+#endif\r
 typedef EFI_SIMPLE_TEXT_IN_PROTOCOL                  EFI_SIMPLE_TEXT_INPUT_PROTOCOL;\r
 typedef EFI_SIMPLE_TEXT_OUT_PROTOCOL                 EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL;\r
 //typedef EFI_TO_LEGACY16_INIT_TABLE                   EFI_TO_COMPATIBILITY16_INIT_TABLE;\r