MdePkg/Include/Uefi/UefiTcgPlatform.h:

MdePkg/Include/Protocol/TcgService.h:
MdePkg/Include/IndustryStandard/Tpm12.h:
* Remove usage of '#pragma push' unsupported usage which is not
  supported by GCC.

MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c:
* Fix a warning encountered with GCC/IPF when Index2 (as a INT8) is
  used as an index to an array on lines 2020 & 2028.

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

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
index 3c5b197c16a948237794f1c75ac4704e1125f55e..a30d8c7f7f31dd6caac8f9fce4626c3d7cbe824b 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
@@ -2101,7 +2101,7 @@ DoDhcpDora (
     // now look for DHCP onlys and a Proxy\r
     //\r
     for (Index = 0; Index < NumOffers; ++Index) {\r
-      INT8  Index2;\r
+      INTN  Index2;\r
 \r
       //\r
       // ignore proxies, bootps, non DHCP onlys, and bootable DHCPS\r

diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h
index fc2eaa4da227228cc10346a0b54df0a0bf005718..86eb8e0e1119a4bf4fafee93276ad00450742512 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Tpm12.h
+++ b/MdePkg/Include/IndustryStandard/Tpm12.h
@@ -25,7 +25,7 @@
 // Structures are all packed on 1-byte alignment\r
 //\r
 \r
-#pragma pack (push, 1)\r
+#pragma pack (1)\r
 \r
 //\r
 // Part 2, section 2.2: Basic types & Helper redefinitions\r
@@ -1835,6 +1835,6 @@ typedef struct tdTPM_RSP_COMMAND_HDR {
   TPM_RESULT                        returnCode;\r
 } TPM_RSP_COMMAND_HDR;\r
 \r
-#pragma pack (pop)\r
+#pragma pack ()\r
 \r
 #endif  // _TPM12_H_\r

diff --git a/MdePkg/Include/Protocol/TcgService.h b/MdePkg/Include/Protocol/TcgService.h
index 762e0ea6bfbaaac0c36639bfbcf487555ba5975c..430e4a6a84b1cb8eb3064e3019b2ea7e0a131fbd 100644 (file)
--- a/MdePkg/Include/Protocol/TcgService.h
+++ b/MdePkg/Include/Protocol/TcgService.h
@@ -26,7 +26,7 @@ typedef struct _EFI_TCG_PROTOCOL EFI_TCG_PROTOCOL;
 //\r
 // Set structure alignment to 1-byte\r
 //\r
-#pragma pack (push, 1)\r
+#pragma pack (1)\r
 \r
 typedef struct {\r
   UINT8  Major;\r
@@ -50,7 +50,7 @@ typedef UINT32   TCG_ALGORITHM_ID;
 //\r
 // Restore original structure alignment\r
 //\r
-#pragma pack (pop)\r
+#pragma pack ()\r
 \r
 /**\r
   This service provides EFI protocol capability information, state information \r

diff --git a/MdePkg/Include/Uefi/UefiTcgPlatform.h b/MdePkg/Include/Uefi/UefiTcgPlatform.h
index 155c940532ea805865736996d028cdac829b8dbc..a67bfcb277e12e021fd4bacbb460767ce9778016 100644 (file)
--- a/MdePkg/Include/Uefi/UefiTcgPlatform.h
+++ b/MdePkg/Include/Uefi/UefiTcgPlatform.h
@@ -56,7 +56,7 @@
 //\r
 // Set structure alignment to 1-byte\r
 //\r
-#pragma pack (push, 1)\r
+#pragma pack (1)\r
 \r
 typedef UINT32                     TCG_EVENTTYPE;\r
 \r
@@ -144,7 +144,7 @@ typedef struct tdEFI_GPT_DATA {
 //\r
 // Restore original structure alignment\r
 //\r
-#pragma pack (pop)\r
+#pragma pack ()\r
 \r
 #endif\r
 \r