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