diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-16 16:53:12 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-16 16:53:12 +0000 |
| commit | a04ad3f01fe97649f3ff7097443f08b7a597d797 (patch) | |
| tree | a8a4290ca95bfb939b234341c3ba356796a66881 | |
| parent | bab3f2d3acb8b66477e6641b330147ec62835ed4 (diff) | |
| download | edk2-a04ad3f01fe97649f3ff7097443f08b7a597d797.zip edk2-a04ad3f01fe97649f3ff7097443f08b7a597d797.tar.gz edk2-a04ad3f01fe97649f3ff7097443f08b7a597d797.tar.bz2 | |
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
| -rw-r--r-- | MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c | 2 | ||||
| -rw-r--r-- | MdePkg/Include/IndustryStandard/Tpm12.h | 4 | ||||
| -rw-r--r-- | MdePkg/Include/Protocol/TcgService.h | 4 | ||||
| -rw-r--r-- | MdePkg/Include/Uefi/UefiTcgPlatform.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c index 3c5b197..a30d8c7 100644 --- 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
//
for (Index = 0; Index < NumOffers; ++Index) {
- INT8 Index2;
+ INTN Index2;
//
// ignore proxies, bootps, non DHCP onlys, and bootable DHCPS
diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h index fc2eaa4..86eb8e0 100644 --- a/MdePkg/Include/IndustryStandard/Tpm12.h +++ b/MdePkg/Include/IndustryStandard/Tpm12.h @@ -25,7 +25,7 @@ // Structures are all packed on 1-byte alignment
//
-#pragma pack (push, 1)
+#pragma pack (1)
//
// Part 2, section 2.2: Basic types & Helper redefinitions
@@ -1835,6 +1835,6 @@ typedef struct tdTPM_RSP_COMMAND_HDR { TPM_RESULT returnCode;
} TPM_RSP_COMMAND_HDR;
-#pragma pack (pop)
+#pragma pack ()
#endif // _TPM12_H_
diff --git a/MdePkg/Include/Protocol/TcgService.h b/MdePkg/Include/Protocol/TcgService.h index 762e0ea..430e4a6 100644 --- a/MdePkg/Include/Protocol/TcgService.h +++ b/MdePkg/Include/Protocol/TcgService.h @@ -26,7 +26,7 @@ typedef struct _EFI_TCG_PROTOCOL EFI_TCG_PROTOCOL; //
// Set structure alignment to 1-byte
//
-#pragma pack (push, 1)
+#pragma pack (1)
typedef struct {
UINT8 Major;
@@ -50,7 +50,7 @@ typedef UINT32 TCG_ALGORITHM_ID; //
// Restore original structure alignment
//
-#pragma pack (pop)
+#pragma pack ()
/**
This service provides EFI protocol capability information, state information
diff --git a/MdePkg/Include/Uefi/UefiTcgPlatform.h b/MdePkg/Include/Uefi/UefiTcgPlatform.h index 155c940..a67bfcb 100644 --- a/MdePkg/Include/Uefi/UefiTcgPlatform.h +++ b/MdePkg/Include/Uefi/UefiTcgPlatform.h @@ -56,7 +56,7 @@ //
// Set structure alignment to 1-byte
//
-#pragma pack (push, 1)
+#pragma pack (1)
typedef UINT32 TCG_EVENTTYPE;
@@ -144,7 +144,7 @@ typedef struct tdEFI_GPT_DATA { //
// Restore original structure alignment
//
-#pragma pack (pop)
+#pragma pack ()
#endif
|