diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h index 0e5a9019e86a..0435bebe8e18 100644 --- a/MdePkg/Include/IndustryStandard/Tpm12.h +++ b/MdePkg/Include/IndustryStandard/Tpm12.h @@ -9,14 +9,6 @@ #ifndef _TPM12_H_ #define _TPM12_H_ -/// -/// Temporary disable 4201 to support anonymous unions -/// -#if defined (_MSC_EXTENSIONS) -#pragma warning( push ) -#pragma warning ( disable : 4201 ) -#endif - /// /// The start of TPM return codes /// @@ -752,10 +744,7 @@ typedef struct tdTPM_PERMANENT_FLAGS { BOOLEAN TPMpost; BOOLEAN TPMpostLock; BOOLEAN FIPS; - union { - BOOLEAN operator; - BOOLEAN operator_; - }; + BOOLEAN operator_; BOOLEAN enableRevokeEK; BOOLEAN nvLocked; BOOLEAN readSRKPub; @@ -2173,11 +2162,4 @@ typedef struct tdTPM_RSP_COMMAND_HDR { #pragma pack () -/// -/// Temporary disable 4201 to support anonymous unions -/// -#if defined (_MSC_EXTENSIONS) -#pragma warning( pop ) -#endif - #endif diff --git a/MdePkg/Include/IndustryStandard/Tpm20.h b/MdePkg/Include/IndustryStandard/Tpm20.h index 52092bd6144f..609b727ac8ee 100644 --- a/MdePkg/Include/IndustryStandard/Tpm20.h +++ b/MdePkg/Include/IndustryStandard/Tpm20.h @@ -15,14 +15,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include -/// -/// Temporary disable 4201 to support anonymous unions -/// -#if defined (_MSC_EXTENSIONS) -#pragma warning( push ) -#pragma warning ( disable : 4201 ) -#endif - #pragma pack (1) // Annex A Algorithm Constants @@ -1256,10 +1248,7 @@ typedef union { TPMI_AES_KEY_BITS aes; TPMI_SM4_KEY_BITS SM4; TPM_KEY_BITS sym; - union { - TPMI_ALG_HASH xor; - TPMI_ALG_HASH xor_; - }; + TPMI_ALG_HASH xor_; } TPMU_SYM_KEY_BITS; // Table 123 - TPMU_SYM_MODE Union @@ -1332,10 +1321,7 @@ typedef struct { // Table 136 - TPMU_SCHEME_KEYEDHASH Union typedef union { TPMS_SCHEME_HMAC hmac; - union { - TPMS_SCHEME_XOR xor; - TPMS_SCHEME_XOR xor_; - }; + TPMS_SCHEME_XOR xor_; } TPMU_SCHEME_KEYEDHASH; // Table 137 - TPMT_KEYEDHASH_SCHEME Structure @@ -1824,11 +1810,4 @@ typedef struct { #define HASH_ALG_SHA512 0x00000008 #define HASH_ALG_SM3_256 0x00000010 -/// -/// Temporary disable 4201 to support anonymous unions -/// -#if defined (_MSC_EXTENSIONS) -#pragma warning( pop ) -#endif - #endif