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

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EdkIIGlueLib / EntryPoints / EdkIIGluePeimEntryPoint.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGluePeimEntryPoint.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGluePeimEntryPoint.c
index b84c883978e1a104dda3b6c7d7377d6b80cc9b56..f46228c9c772559c2780f4951a1028b11304ed1f 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGluePeimEntryPoint.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/EntryPoints/EdkIIGluePeimEntryPoint.c
@@ -32,20 +32,12 @@ Abstract:
 // Library constructors\r
 //\r
 VOID\r
+EFIAPI\r
 ProcessLibraryConstructorList (\r
   IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
   IN EFI_PEI_SERVICES          **PeiServices\r
   )\r
 {\r
-//\r
-// Declare "Status" if any of the following libraries are used\r
-//\r
-#if defined(__EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB_MM7__)    \\r
-    || defined(__EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB_KR1__) \\r
-    || defined(__EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB__)\r
-  EFI_STATUS  Status;\r
-#endif\r
-\r
 //\r
 // EdkII Glue Library Constructors: \r
 // PeiServicesTablePointerLib      PeiServicesTablePointerLibConstructor()\r
@@ -56,6 +48,8 @@ ProcessLibraryConstructorList (
 #if defined(__EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB_MM7__)    \\r
     || defined(__EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB_KR1__) \\r
     || defined(__EDKII_GLUE_PEI_SERVICES_TABLE_POINTER_LIB__)\r
+  EFI_STATUS  Status;\r
+\r
   Status = PeiServicesTablePointerLibConstructor (FfsHeader, PeiServices);\r
   ASSERT_EFI_ERROR (Status);\r
 #endif\r