Removed extra typedefs on structures to fix error generated by gcc.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Protocol / PlatformMemTest / PlatformMemTest.h

diff --git a/EdkCompatibilityPkg/Foundation/Protocol/PlatformMemTest/PlatformMemTest.h b/EdkCompatibilityPkg/Foundation/Protocol/PlatformMemTest/PlatformMemTest.h
index 356563edaf91c0e11adcca74eae059d5f96fda12..fd51bd0d4f934ef79c33891af9262ade7d55ea73 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Protocol/PlatformMemTest/PlatformMemTest.h
+++ b/EdkCompatibilityPkg/Foundation/Protocol/PlatformMemTest/PlatformMemTest.h
@@ -1,7 +1,7 @@
 \r
  /*++\r
 \r
-Copyright (c) 2004, 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
@@ -22,8 +22,11 @@ Abstract:
 #ifndef __PLATFORM_MEMTEST_H__\r
 #define __PLATFORM_MEMTEST_H__\r
 \r
-\r
+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
+#include EFI_PROTOCOL_CONSUMER (HiiDatabase)\r
+#else\r
 #include EFI_PROTOCOL_CONSUMER (Hii)\r
+#endif\r
 #include EFI_PROTOCOL_CONSUMER (GenericMemoryTest)\r
 \r
 \r
@@ -237,7 +240,7 @@ EFI_STATUS
   OUT BOOLEAN                               *Overlap\r
   );\r
 \r
-typedef struct _EFI_PLATFORM_MEMTEST_PROTOCOL {\r
+struct _EFI_PLATFORM_MEMTEST_PROTOCOL {\r
   EFI_PLATFORM_MEMTEST_NOTIFY_PHASE       NotifyPhase;\r
   EFI_PLATFORM_MEMTEST_GET_PLATFORM_INFO  GetPlatformInfo;\r
   EFI_PLATFORM_MEMTEST_GET_NEXT_DIMM_INFO GetNextDimmInfo;\r
@@ -249,7 +252,7 @@ typedef struct _EFI_PLATFORM_MEMTEST_PROTOCOL {
   EFI_PLATFORM_MEMTEST_CLEAR_ERROR        ClearError;\r
   EFI_PLATFORM_MEMTEST_DISABLE_DIMM       DisableDimm;\r
   EFI_PLATFORM_MEMTEST_OVERLAP            Overlap;\r
-} EFI_PLATFORM_MEMTEST_PROTOCOL;\r
+};\r
 \r
 \r
 \r