From nobody Tue Feb 10 04:12:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+105468+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105468+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1685472812; cv=none; d=zohomail.com; s=zohoarc; b=FWPrWh+Qrph62wf8XuLCzsKfPPV++jBq7vq32fS5x/EvVyXT0JLLSNW6M9kpdT8HMfYKR6mkTy9swrEu8wcJ0FGwiJ12+nCIMAFZkfAAZ1CalVxrCJcQ3BR6SfBm5EJO1AcvnSUobD7VWbnSKRamqpGtbA/6XocLBE9VCg1vHvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685472812; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=1oOhEYv6Nd0UtBR0fR4qWuD36rSTdfuGKoXJWHgef9Y=; b=KU3/Uopy4t4MYIB1MgPeqUTuh3QY224MtKgu2ou3tCoLOeJomklvp8sl85fQdyGTAc2+0BfrW//uC8TjjJ8+pH6zRkB0ZZ3SfgDllpdDEV76kXQcen1qMwh1FXWXomWccvHxXxYX+VvTOksx0zuHvnAyh1TxLoydQWYN52Cdyrs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+105468+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1685472812377538.7898008452802; Tue, 30 May 2023 11:53:32 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZwfBYY1788612xnS5SZCRUZ5; Tue, 30 May 2023 11:53:32 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.2491.1685472809773224682 for ; Tue, 30 May 2023 11:53:30 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="352514934" X-IronPort-AV: E=Sophos;i="6.00,205,1681196400"; d="scan'208";a="352514934" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 11:53:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="771675340" X-IronPort-AV: E=Sophos;i="6.00,205,1681196400"; d="scan'208";a="771675340" X-Received: from unknown (HELO mdkinney-mobl.amr.corp.intel.com) ([10.241.111.19]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 11:53:30 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu , Oliver Smith-Denny , Pedro Falcato , Aaron Pop Subject: [edk2-devel] [Patch v2 3/3] MdePkg/Include/IndustryStandard: Address C++ keyword collisions Date: Tue, 30 May 2023 11:53:22 -0700 Message-Id: <20230530185322.70-4-michael.d.kinney@intel.com> In-Reply-To: <20230530185322.70-1-michael.d.kinney@intel.com> References: <20230530185322.70-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: YwdDovnbP7YxaigxPsFjRGtfx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1685472812; bh=iSrh72KDRphSHNyWDDxzSylQwnWJqe+jG/babYN4voo=; h=Cc:Date:From:Reply-To:Subject:To; b=DzZUW3gC9/a7XQW6vPt+wHo3EPFZlzzzs/HyXL4lrg8BrVl/BWzPtdbAg+gFY/wryTT 8ZFT4nm/lnEQ8k43aCt6zYJKAjbPTzn+uz6FOed2w1zIEEKjafFJr6L5rF1HLgmSdsL/0 DPRYVw+8cmsx6oa68MDmEnscldwdw9Jg7BQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1685472813587100005 Content-Type: text/plain; charset="utf-8" Update Tpm12.h and Tpm20.h and not use c++ reserved keywords operator and xor in C structures to support use of these include files when building with a C++ compiler. This patch removes the temporary use of anonymous unions and warning 4201 disable for VS20xx tool chains to complete the following field name changes: * operator -> Operator * xor -> Xor NOTE: This is a non-backwards compatible change to Tpm12.h and Tmp20.h. And consumers of these include files that access the "operator" or "xor" fields must be updated. Cc: Liming Gao Cc: Zhiguang Liu Cc: Oliver Smith-Denny Cc: Pedro Falcato Cc: Aaron Pop Signed-off-by: Michael D Kinney --- MdePkg/Include/IndustryStandard/Tpm12.h | 20 +------------------- MdePkg/Include/IndustryStandard/Tpm20.h | 25 ++----------------------- 2 files changed, 3 insertions(+), 42 deletions(-) diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/Indus= tryStandard/Tpm12.h index 56e89d9d0835..147c0863fffd 100644 --- a/MdePkg/Include/IndustryStandard/Tpm12.h +++ b/MdePkg/Include/IndustryStandard/Tpm12.h @@ -9,14 +9,6 @@ #ifndef _TPM12_H_ #define _TPM12_H_ =20 -/// -/// 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 { =20 #pragma pack () =20 -/// -/// 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/Indus= tryStandard/Tpm20.h index a602c0d9c289..c827af13efd0 100644 --- a/MdePkg/Include/IndustryStandard/Tpm20.h +++ b/MdePkg/Include/IndustryStandard/Tpm20.h @@ -15,14 +15,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include =20 -/// -/// Temporary disable 4201 to support anonymous unions -/// -#if defined (_MSC_EXTENSIONS) -#pragma warning( push ) -#pragma warning ( disable : 4201 ) -#endif - #pragma pack (1) =20 // Annex A Algorithm Constants @@ -1255,10 +1247,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; =20 // Table 123 - TPMU_SYM_MODE Union @@ -1331,10 +1320,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; =20 // Table 137 - TPMT_KEYEDHASH_SCHEME Structure @@ -1823,11 +1809,4 @@ typedef struct { #define HASH_ALG_SHA512 0x00000008 #define HASH_ALG_SM3_256 0x00000010 =20 -/// -/// Temporary disable 4201 to support anonymous unions -/// -#if defined (_MSC_EXTENSIONS) -#pragma warning( pop ) -#endif - #endif --=20 2.40.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#105468): https://edk2.groups.io/g/devel/message/105468 Mute This Topic: https://groups.io/mt/99226545/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-