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

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

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.h
index 3c3076954d7b5ae24317e7c825e35ccd6052b53f..376d7f38acc3185a548706c30b01b1da2ba70d09 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Common/EdkIIGlueDefinitionChangesBase.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_BASE_H__\r
 #define __EDKII_GLUE_DEFINITION_CHANGES_BASE_H__\r
 \r
+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
+#include "TianoHii.h"\r
+#else\r
 #include "EfiInternalFormRepresentation.h"\r
+#endif\r
 #include "EfiPxe.h"\r
 \r
 \r
@@ -47,7 +51,7 @@ Abstract:
 // ----------------------------------------------------------------------------------\r
 // InternalFormRepresentation.h:\r
 // ----------------------------------------------------------------------------------\r
-\r
+#if (EFI_SPECIFICATION_VERSION < 0x0002000A)\r
 typedef struct {\r
   EFI_IFR_OP_HEADER Header;\r
   UINT16            QuestionId; // The ID designating what the question is about...sucked in from a #define, likely in the form of a variable name\r
@@ -66,6 +70,7 @@ typedef struct {
 typedef struct {\r
   EFI_IFR_OP_HEADER Header;\r
 } EFI_IFR_END_EXPR;\r
+#endif\r
 \r
 // ------------------------\r
 // define GUID as EFI_GUID\r