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

edk2/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h:
* Changed name of colliding function pointer typedef.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4930 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BlockIo/BlockIo.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BlockIo/BlockIo.h
index 5433edb370e18153c01c586d7ed4a051c2a15e2a..58c953fea40e0de0bd582c9f371380ade539e470 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BlockIo/BlockIo.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BlockIo/BlockIo.h
@@ -77,11 +77,11 @@ EFI_STATUS
   OUT VOID                                     *Buffer\r
   );\r
 \r
-typedef struct _PEI_RECOVERY_BLOCK_IO_INTERFACE {\r
+struct _PEI_RECOVERY_BLOCK_IO_INTERFACE {\r
   PEI_GET_NUMBER_BLOCK_DEVICES      GetNumberOfBlockDevices;\r
   PEI_GET_DEVICE_MEDIA_INFORMATION  GetBlockDeviceMediaInfo;\r
   PEI_READ_BLOCKS                   ReadBlocks;\r
-} PEI_RECOVERY_BLOCK_IO_INTERFACE;\r
+};\r
 \r
 extern EFI_GUID gPeiBlockIoPpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootScriptExecuter/BootScriptExecuter.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootScriptExecuter/BootScriptExecuter.h
index 3dd29ce8f52d2145986278912dd97d10245e5c1b..48df299003daa000c3584d51f94be60afb33dcdd 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootScriptExecuter/BootScriptExecuter.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/BootScriptExecuter/BootScriptExecuter.h
@@ -40,10 +40,10 @@ EFI_STATUS
   IN     EFI_GUID                                * FvFile OPTIONAL\r
   );\r
 \r
-typedef struct _PEI_BOOT_SCRIPT_EXECUTER_PPI {\r
+struct _PEI_BOOT_SCRIPT_EXECUTER_PPI {\r
   UINT64                  Revision;\r
   PEI_BOOT_SCRIPT_EXECUTE Execute;\r
-} PEI_BOOT_SCRIPT_EXECUTER_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiBootScriptExecuterPpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/CpuIo/CpuIo.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/CpuIo/CpuIo.h
index 3d5aba7589e8c43bededacbe3bfdb48940adbab2..8a4c5f6e0c9e03d195dd8e76244650cd7a072c14 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/CpuIo/CpuIo.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/CpuIo/CpuIo.h
@@ -224,7 +224,7 @@ VOID
 // PEI_CPU_IO_PPI\r
 // *******************************************************\r
 //\r
-typedef struct _PEI_CPU_IO_PPI {\r
+struct _PEI_CPU_IO_PPI {\r
   PEI_CPU_IO_PPI_ACCESS       Mem;\r
   PEI_CPU_IO_PPI_ACCESS       Io;\r
   PEI_CPU_IO_PPI_IO_READ8     IoRead8;\r
@@ -243,7 +243,7 @@ typedef struct _PEI_CPU_IO_PPI {
   PEI_CPU_IO_PPI_MEM_WRITE16  MemWrite16;\r
   PEI_CPU_IO_PPI_MEM_WRITE32  MemWrite32;\r
   PEI_CPU_IO_PPI_MEM_WRITE64  MemWrite64;\r
-} PEI_CPU_IO_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiCpuIoPpiInServiceTableGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Decompress/Decompress.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Decompress/Decompress.h
index 4a017428afee7e294695ab246aeeb3238747dc46..9d5c0538da05378e9cce6f58624215202decfdc2 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Decompress/Decompress.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Decompress/Decompress.h
@@ -38,9 +38,9 @@ EFI_STATUS
   OUT UINTN                                  *OutputSize\r
   );\r
 \r
-typedef struct _EFI_PEI_DECOMPRESS_PPI {\r
+struct _EFI_PEI_DECOMPRESS_PPI {\r
   EFI_PEI_DECOMPRESS_DECOMPRESS   Decompress;\r
-} EFI_PEI_DECOMPRESS_PPI;\r
+};\r
 \r
 \r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/DeviceRecoveryModule/DeviceRecoveryModule.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/DeviceRecoveryModule/DeviceRecoveryModule.h
index fd7b4cb4bc57a631a617fa26aebdef8d6a157ae3..cbaa0da2961b316bf3d436a6b0a4e68de0a6e292 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/DeviceRecoveryModule/DeviceRecoveryModule.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/DeviceRecoveryModule/DeviceRecoveryModule.h
@@ -57,11 +57,11 @@ EFI_STATUS
   OUT VOID                                        *Buffer\r
   );\r
 \r
-typedef struct _PEI_DEVICE_RECOVERY_MODULE_INTERFACE {\r
+struct _PEI_DEVICE_RECOVERY_MODULE_INTERFACE {\r
   PEI_DEVICE_GET_NUMBER_RECOVERY_CAPSULE  GetNumberRecoveryCapsules;\r
   PEI_DEVICE_GET_RECOVERY_CAPSULE_INFO    GetRecoveryCapsuleInfo;\r
   PEI_DEVICE_LOAD_RECOVERY_CAPSULE        LoadRecoveryCapsule;\r
-} PEI_DEVICE_RECOVERY_MODULE_INTERFACE;\r
+};\r
 \r
 extern EFI_GUID gPeiDeviceRecoveryModulePpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/DxeIpl/DxeIpl.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/DxeIpl/DxeIpl.h
index d3cd1b121ceb659e8cc47c3b88298a2a47eab479..5287ebe28566b1f5c3403c4c730eace5ae118a92 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/DxeIpl/DxeIpl.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/DxeIpl/DxeIpl.h
@@ -42,9 +42,9 @@ EFI_STATUS
   IN EFI_PEI_HOB_POINTERS         HobList\r
   );\r
 \r
-typedef struct _EFI_DXE_IPL_PPI {\r
+struct _EFI_DXE_IPL_PPI {\r
   EFI_DXE_IPL_ENTRY Entry;\r
-} EFI_DXE_IPL_PPI;\r
+};\r
 \r
 extern EFI_GUID gEfiDxeIplPpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/FindFv/FindFv.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/FindFv/FindFv.h
index 72935f43a3146bc63be8d1a546e72dd0dd844733..d8c810e13411d29d1bbdb34a68ab8a8ff478846f 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/FindFv/FindFv.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/FindFv/FindFv.h
@@ -42,9 +42,9 @@ EFI_STATUS
   EFI_FIRMWARE_VOLUME_HEADER  **FVAddress\r
   );\r
 \r
-typedef struct _EFI_FIND_FV_PPI {\r
+struct _EFI_FIND_FV_PPI {\r
   EFI_FIND_FV_FINDFV  FindFv;\r
-} EFI_FIND_FV_PPI;\r
+};\r
 \r
 extern EFI_GUID gEfiFindFvPpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolume/FirmwareVolume.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolume/FirmwareVolume.h
index ff7584820a5c4a44710c3ca00ea4153f15fa560a..6196da593847799c1ef8803353fdd2461659cadd 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolume/FirmwareVolume.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolume/FirmwareVolume.h
@@ -100,13 +100,13 @@ EFI_STATUS
   OUT VOID                               **SectionData\r
   );\r
 \r
-typedef struct _EFI_PEI_FIRMWARE_VOLUME_PPI {\r
+struct _EFI_PEI_FIRMWARE_VOLUME_PPI {\r
   EFI_PEI_FV_PROCESS_FV             ProcessVolume;\r
   EFI_PEI_FV_FIND_FILE_TYPE         FindFileByType;   \r
   EFI_PEI_FV_FIND_FILE_NAME         FindFileByName;     \r
   EFI_PEI_FV_GET_FILE_INFO          GetFileInfo;      \r
   EFI_PEI_FV_GET_INFO               GetVolumeInfo;\r
   EFI_PEI_FV_FIND_SECTION           FindSectionByType;\r
-} EFI_PEI_FIRMWARE_VOLUME_PPI;\r
+};\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolumeInfo/FirmwareVolumeInfo.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolumeInfo/FirmwareVolumeInfo.h
index f659be7f2e71cbbcd89c1d57f485f3d8deae759b..94ecf30ace0754ec6be8f078adde4d5d0d377c3a 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolumeInfo/FirmwareVolumeInfo.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolumeInfo/FirmwareVolumeInfo.h
@@ -32,13 +32,13 @@ EFI_FORWARD_DECLARATION (EFI_PEI_FIRMWARE_VOLUME_INFO_PPI);
   { 0x49edb1c1, 0xbf21, 0x4761, { 0xbb, 0x12, 0xeb, 0x0, 0x31, 0xaa, 0xbb, 0x39 } }\r
 \r
 \r
-typedef struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI {\r
+struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI {\r
   EFI_GUID            FvFormat;\r
   VOID                *FvInfo;\r
   UINT32              FvInfoSize;\r
   EFI_GUID            *ParentFvName;\r
   EFI_GUID            *ParentFileName;\r
-} EFI_PEI_FIRMWARE_VOLUME_INFO_PPI;\r
+};\r
 \r
 \r
 extern EFI_GUID gEfiFirmwareVolumeInfoPpiGuid;\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/GuidedSectionExtraction/GuidedSectionExtraction.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/GuidedSectionExtraction/GuidedSectionExtraction.h
index 8ad5e6ae120f92c9b5d9d401a0787bfac2fc2caa..0ed5c92cef7e2db15811c10baa60a1111c8b4fc9 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/GuidedSectionExtraction/GuidedSectionExtraction.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/GuidedSectionExtraction/GuidedSectionExtraction.h
@@ -35,8 +35,8 @@ EFI_STATUS
   OUT UINT32                                      *AuthenticationStatus\r
   );\r
 \r
-typedef struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI {\r
+struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI {\r
   EFI_PEI_EXTRACT_GUIDED_SECTION  ExtractSection;\r
-} EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI;\r
+};\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile/LoadFile.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile/LoadFile.h
index d6cf68af5dc4ba05344176d4e4a28510d1e1aa70..ab02e700223bcd21e1946422c4f8c510bdccb1af 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile/LoadFile.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile/LoadFile.h
@@ -39,9 +39,9 @@ EFI_STATUS
   OUT EFI_PHYSICAL_ADDRESS                      * EntryPoint\r
   );\r
 \r
-typedef struct _EFI_PEI_FV_FILE_LOADER_PPI {\r
+struct _EFI_PEI_FV_FILE_LOADER_PPI {\r
   EFI_PEI_FV_LOAD_FILE  FvLoadFile;\r
-} EFI_PEI_FV_FILE_LOADER_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiFvFileLoaderPpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile2/LoadFile2.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile2/LoadFile2.h
index c43e1fd0daec9444c44982d2c2c7d286e24460c4..65a1418da5a1879a4298cf659296cc35315c84c7 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile2/LoadFile2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile2/LoadFile2.h
@@ -40,9 +40,9 @@ EFI_STATUS
   );\r
 \r
 \r
-typedef struct _EFI_PEI_LOAD_FILE_PPI {\r
+struct _EFI_PEI_LOAD_FILE_PPI {\r
   EFI_PEI_LOAD_FILE LoadFile;\r
-} EFI_PEI_LOAD_FILE_PPI;\r
+};\r
 \r
 \r
 extern EFI_GUID gEfiLoadFile2PpiGuid;\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg/PciCfg.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg/PciCfg.h
index 520f0e686b7b84f097d5b52b778020dae902bed9..00ab983aa5ba4189dc41fd96989be3ba906c9dbb 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg/PciCfg.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg/PciCfg.h
@@ -54,11 +54,11 @@ EFI_STATUS
   IN UINTN                    ClearBits\r
   );\r
 \r
-typedef struct _PEI_PCI_CFG_PPI {\r
+struct _PEI_PCI_CFG_PPI {\r
   PEI_PCI_CFG_PPI_IO  Read;\r
   PEI_PCI_CFG_PPI_IO  Write;\r
   PEI_PCI_CFG_PPI_RW  Modify;\r
-} PEI_PCI_CFG_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiPciCfgPpiInServiceTableGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg2/PciCfg2.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg2/PciCfg2.h
index 766f165e665c0f3322c769c1a87faeb526045b44..ece3a8ff5a4c30407438d8de3e8694df48a7073d 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg2/PciCfg2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg2/PciCfg2.h
@@ -54,12 +54,12 @@ EFI_STATUS
   IN VOID                           *ClearBits\r
   );\r
 \r
-typedef struct _EFI_PEI_PCI_CFG2_PPI {\r
+struct _EFI_PEI_PCI_CFG2_PPI {\r
   EFI_PEI_PCI_CFG_PPI_IO  Read;\r
   EFI_PEI_PCI_CFG_PPI_IO  Write;\r
   EFI_PEI_PCI_CFG_PPI_RW  Modify;\r
   UINT16                  Segment;\r
-} EFI_PEI_PCI_CFG2_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiPciCfg2PpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/RecoveryModule/RecoveryModule.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/RecoveryModule/RecoveryModule.h
index 3a485e0947d28f37cdb7e534fac18285c8ef82fa..e0ceecab167a966ac40543501aeb2cc15de00f47 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/RecoveryModule/RecoveryModule.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/RecoveryModule/RecoveryModule.h
@@ -36,9 +36,9 @@ EFI_STATUS
   IN PEI_RECOVERY_MODULE_INTERFACE          * This\r
   );\r
 \r
-typedef struct _PEI_RECOVERY_MODULE_INTERFACE {\r
+struct _PEI_RECOVERY_MODULE_INTERFACE {\r
   PEI_LOAD_RECOVERY_CAPSULE LoadRecoveryCapsule;\r
-} PEI_RECOVERY_MODULE_INTERFACE;\r
+};\r
 \r
 extern EFI_GUID gPeiRecoveryModulePpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h
index f93fd37f01a43111ff51732acd54205ec69ec084..d3269b488f2f415eb586f56123608c26888cdaab 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h
@@ -41,12 +41,12 @@ typedef enum {
 \r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_PEI_RESET_SYSTEM) (\r
+(EFIAPI *PEI_RESET_PPI_RESET_SYSTEM) (\r
   IN EFI_PEI_SERVICES   **PeiServices\r
   );\r
 \r
 typedef struct {\r
-  EFI_PEI_RESET_SYSTEM  ResetSystem;\r
+  PEI_RESET_PPI_RESET_SYSTEM  ResetSystem;\r
 } PEI_RESET_PPI;\r
 \r
 extern EFI_GUID gPeiResetPpiGuid;\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/S3Resume/S3Resume.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/S3Resume/S3Resume.h
index 66f2c8a004feaf08c59969bf0606dfbcc6c6bf36..f98cbc31a7bfad24e15ea3feed06134d43d518aa 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/S3Resume/S3Resume.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/S3Resume/S3Resume.h
@@ -35,9 +35,9 @@ EFI_STATUS
   IN EFI_PEI_SERVICES   **PeiServices\r
   );\r
 \r
-typedef struct _PEI_S3_RESUME_PPI {\r
+struct _PEI_S3_RESUME_PPI {\r
   PEI_S3_RESUME_PPI_RESTORE_CONFIG  S3RestoreConfig;\r
-} PEI_S3_RESUME_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiS3ResumePpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/SecPlatformInformation/SecPlatformInformation.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/SecPlatformInformation/SecPlatformInformation.h
index 320396751bf38f6df3aec8cef105d4d6f056ba8f..82bbb6f82936896799e330a9584a2f4207b202ac 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/SecPlatformInformation/SecPlatformInformation.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/SecPlatformInformation/SecPlatformInformation.h
@@ -64,8 +64,8 @@ EFI_STATUS
   IN OUT SEC_PLATFORM_INFORMATION_RECORD *PlatformInformationRecord\r
   );\r
 \r
-typedef struct _EFI_SEC_PLATFORM_INFORMATION_PPI {\r
+struct _EFI_SEC_PLATFORM_INFORMATION_PPI {\r
   SEC_PLATFORM_INFORMATION  PlatformInformation;\r
-} EFI_SEC_PLATFORM_INFORMATION_PPI;\r
+};\r
 \r
 #endif\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/SectionExtraction/SectionExtraction.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/SectionExtraction/SectionExtraction.h
index 47ae3d3c97bcfd0c1d092fc54e9539bb987fd62b..fec98b102f9c0948fc7282fb344d373d378bb3bf 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/SectionExtraction/SectionExtraction.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/SectionExtraction/SectionExtraction.h
@@ -50,9 +50,9 @@ EFI_STATUS
 #define EFI_PEI_AUTH_STATUS_NOT_TESTED        0x04\r
 #define EFI_PEI_AUTH_STATUS_TEST_FAILED       0x08\r
 \r
-typedef struct _EFI_PEI_SECTION_EXTRACTION_PPI {\r
+struct _EFI_PEI_SECTION_EXTRACTION_PPI {\r
   EFI_PEI_GET_SECTION PeiGetSection;\r
-} EFI_PEI_SECTION_EXTRACTION_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiSectionExtractionPpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security/Security.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security/Security.h
index 9a5aa15730f6efd712141828d58137d0dfb74699..737fabe104ab8d026dfd00839bfbc12e334a1096 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security/Security.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security/Security.h
@@ -39,9 +39,9 @@ EFI_STATUS
   IN OUT BOOLEAN                  *StartCrisisRecovery\r
   );\r
 \r
-typedef struct _PEI_SECURITY_PPI {\r
+struct _PEI_SECURITY_PPI {\r
   PEI_SECURITY_AUTHENTICATION_STATE AuthenticationState;\r
-} PEI_SECURITY_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiSecurityPpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security2/Security2.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security2/Security2.h
index 59dad703f569558bdc834d09728bfb73096f9475..0b62194e3e7e42a6c8fec4a6a02fb3b8a351e603 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security2/Security2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Security2/Security2.h
@@ -40,9 +40,9 @@ EFI_STATUS
   IN OUT BOOLEAN                  *DeferExection\r
   );\r
 \r
-typedef struct _EFI_PEI_SECURITY2_PPI {\r
+struct _EFI_PEI_SECURITY2_PPI {\r
   EFI_PEI_SECURITY_AUTHENTICATION_STATE  AuthenticationState;\r
-} EFI_PEI_SECURITY2_PPI;\r
+};\r
 \r
 \r
 extern EFI_GUID gEfiPeiSecurity2PpiGuid;\r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus/Smbus.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus/Smbus.h
index cdd1834fa616e0e130e70e8a239fd39146c05f68..5864dcf74e66602b1d64278ef66ccf9dab40fd41 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus/Smbus.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus/Smbus.h
@@ -89,12 +89,12 @@ EFI_STATUS
   IN      PEI_SMBUS_NOTIFY_FUNCTION NotifyFunction\r
   );\r
 \r
-typedef struct _PEI_SMBUS_PPI {\r
+struct _PEI_SMBUS_PPI {\r
   PEI_SMBUS_PPI_EXECUTE_OPERATION Execute;\r
   PEI_SMBUS_PPI_ARP_DEVICE        ArpDevice;\r
   PEI_SMBUS_PPI_GET_ARP_MAP       GetArpMap;\r
   PEI_SMBUS_PPI_NOTIFY            Notify;\r
-} PEI_SMBUS_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiSmbusPpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus2/Smbus2.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus2/Smbus2.h
index e34d380dfe896e9738ad5fc1d06a7cd919b0b781..4a9794518cd40f8d6d64673d3d14c63db66eb0b7 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus2/Smbus2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus2/Smbus2.h
@@ -83,13 +83,13 @@ EFI_STATUS
   IN      EFI_PEI_SMBUS_NOTIFY2_FUNCTION NotifyFunction\r
   );\r
 \r
-typedef struct _EFI_PEI_SMBUS2_PPI {\r
+struct _EFI_PEI_SMBUS2_PPI {\r
   EFI_PEI_SMBUS2_PPI_EXECUTE_OPERATION Execute;\r
   EFI_PEI_SMBUS2_PPI_ARP_DEVICE        ArpDevice;\r
   EFI_PEI_SMBUS2_PPI_GET_ARP_MAP       GetArpMap;\r
   EFI_PEI_SMBUS2_PPI_NOTIFY            Notify;\r
   EFI_GUID                             Identifier;\r
-} EFI_PEI_SMBUS2_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiSmbus2PpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Stall/Stall.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Stall/Stall.h
index f84a17ec11e710804b9dadf1e977f91b26b3a0e2..311d351bc88b85a16341f79c945ada7b28620003 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Stall/Stall.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Stall/Stall.h
@@ -37,10 +37,10 @@ EFI_STATUS
   IN UINTN                      Microseconds\r
   );\r
 \r
-typedef struct _PEI_STALL_PPI {\r
+struct _PEI_STALL_PPI {\r
   UINTN     Resolution;\r
   PEI_STALL Stall;\r
-} PEI_STALL_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiStallPpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/StatusCode/StatusCode.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/StatusCode/StatusCode.h
index fd05b649b7777de310a50dcfb46bbaf84c9ad07f..41be87f890b55f4a54fe75ed5b2d861913ed85eb 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/StatusCode/StatusCode.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/StatusCode/StatusCode.h
@@ -40,9 +40,9 @@ EFI_STATUS
   IN EFI_STATUS_CODE_DATA            * Data OPTIONAL\r
   );\r
 \r
-typedef struct _PEI_STATUS_CODE_PPI {\r
+struct _PEI_STATUS_CODE_PPI {\r
   PEI_REPORT_STATUS_CODE  ReportStatusCode;\r
-} PEI_STATUS_CODE_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiStatusCodePpiGuid;\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable2/Variable2.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable2/Variable2.h
index 52e5980749de418ab24baa8e1fe6dd76b89e5a56..8e2614a44ede767b6b026e887fd6c613f1bbebca 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable2/Variable2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable2/Variable2.h
@@ -51,10 +51,10 @@ EFI_STATUS
   IN OUT EFI_GUID                             *VariableGuid\r
   );\r
 \r
-typedef struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI {\r
+struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI {\r
   EFI_PEI_GET_VARIABLE2            GetVariable;\r
   EFI_PEI_GET_NEXT_VARIABLE_NAME2  GetNextVariableName;\r
-} EFI_PEI_READ_ONLY_VARIABLE2_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiReadOnlyVariable2PpiGuid;\r
 \r