From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 8E5FF940D08 for ; Mon, 24 Jul 2023 01:56:50 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=o2tRE/nOcnq22wdaLs9dRHihSK+5da3byJWogkc0Krw=; c=relaxed/simple; d=groups.io; h=X-Received:X-Received:X-IronPort-AV:X-IronPort-AV:X-Received:X-ExtLoop1:X-IronPort-AV:X-IronPort-AV:X-Received:X-Received:X-Received:X-Received:ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:X-Received:X-Received:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:X-MS-Has-Attach:X-MS-TNEF-Correlator:x-ms-publictraffictype:x-ms-traffictypediagnostic:x-ms-office365-filtering-correlation-id:x-ms-exchange-senderadcheck:x-ms-exchange-antispam-relay:x-microsoft-antispam-message-info:x-ms-exchange-antispam-messagedata-chunkcount:x-ms-exchange-antispam-messagedata-0:MIME-Version:X-MS-Exchange-CrossTenant-AuthAs:X-MS-Exchange-CrossTenant-AuthSource:X-MS-Exchange-CrossTenant-Network-Message-Id:X-MS-Exchange-CrossTenant-originalarrivaltime:X-MS-Exchange-CrossTenant-fromentityheader:X-MS-Exchange-CrossTenant-id:X-MS-Exchange-CrossTenant-mailboxtype:X-MS-Exchange-CrossTenant-userprincipalname:X-MS-Exchange-Transport-CrossTenantHeaders Stamped:X-OriginatorOrg:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:X-Gm-Message-State:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1690163809; v=1; b=oTrMtL0HWBwuS8C96SPLJOXz05bOdEbBvUyF8dVL2yYEUFV5d18shOv3v5gDUfdax0ekJ4H8 BLvRNm3zUritjA2G0XTNeB0XP4D9Koj3ffNOyow8u+8FH2JMMAR+dCR0lAfZCoXTfpaa/5ao0kG Ml8rxtg6IGeHwH0waty08gs8= X-Received: by 127.0.0.2 with SMTP id rtgTYY7687511xMBVmbyhLIi; Sun, 23 Jul 2023 18:56:49 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.39213.1690163808290189507 for ; Sun, 23 Jul 2023 18:56:48 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="364785520" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="364785520" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2023 18:56:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="849455137" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="849455137" X-Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga004.jf.intel.com with ESMTP; 23 Jul 2023 18:56:47 -0700 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Sun, 23 Jul 2023 18:56:46 -0700 X-Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27 via Frontend Transport; Sun, 23 Jul 2023 18:56:46 -0700 X-Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.105) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.27; Sun, 23 Jul 2023 18:56:46 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FzCrkhQokoR4LrAOHo8QXmsSnqtN4HF/OMc+Ve73gu8KeA8sC5H2FYf1an6XS5nzBBJCCUP/G1bbR3YCPGtaAnv97VKtMAQ3esTdmtEfv1MTCR3/wcKDU7A0zI0Cb4h9W0/MHpdCp3H62PgIQsUtO7JWfVheHNIXHrpsmrBIeBl1ALhRJSupo5l02HHFPaDHKbdU1gqK4Rux6G1oMz3d/fMxpuO3yqxo0t/2beaZwQdI4A7vpDhujVTAl3nU1bSLVJZKKIULnnxbLXVr9PjFg+n0xOqWTQSureQVQbJ+8dE9guRmWgmqaAcH99NRNLNxF98kVmBHGNs9PNxHamsiSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ozukgfKqIS98wjaQrW9kyMpVwcqKbvXQcz5xIzyjB1Q=; b=go5Ctx11/GI507cM/+nroKcidrONIMbtmNcLXZ6cbniCYugxjYygvRP/Mw2mAX+shkcfBWdAnrnZ6ojvmR55zfbLR/iGUPsYpzj8L87aNxZL1H5S4fz7bRFTdr3iSsB3EMi4k2tBnZkQX+/VPrBjzTnpF3KKqJmCej68kaywRfJmWEpXJkevBiWA/6tFf+asEWVqVKgcPYot9TLDdaw9Y5b2dcRFl4fnKzfVBUoUdwBo/F8yQ0fRxGRpQfHI7fdPIns8Xq95GwvaaZXBnMF/aXgIY2i3wf11DC8YbRT1jkheZjeSXbX9taSejdic26aZhgQsiAZ3hXL3lOaCRhztFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by PH0PR11MB4808.namprd11.prod.outlook.com (2603:10b6:510:39::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Mon, 24 Jul 2023 01:56:45 +0000 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::bf9a:54ca:d270:59b]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::bf9a:54ca:d270:59b%5]) with mapi id 15.20.6609.025; Mon, 24 Jul 2023 01:56:45 +0000 From: "Ni, Ray" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: Gerd Hoffmann , Rebecca Cran , Andrew Fish Subject: Re: [edk2-devel] [Patch 1/2] EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION redefinition error Thread-Topic: [Patch 1/2] EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION redefinition error Thread-Index: AQHZvDjGaHk81QA2UE6Cg9hX+NuJk6/IK6dw Date: Mon, 24 Jul 2023 01:56:45 +0000 Message-ID: References: <20230722010622.1708-1-michael.d.kinney@intel.com> <20230722010622.1708-2-michael.d.kinney@intel.com> In-Reply-To: <20230722010622.1708-2-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|PH0PR11MB4808:EE_ x-ms-office365-filtering-correlation-id: 143c2d66-0581-4d0d-1774-08db8be93bec x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: N1hJfFKnKv4k51K60UkiDnprhDhN4XOSHQaGj+Bt9/yFAfN39i8hEwgOQsDA3iEbVV17oZFemfTpKx4BKQcCpPcndbKX3G4DqhDyTMrAJiYyokZ1IAwJdxM+9FtDU0j7cVUOLvcGQYpGWuZbSZtVhJ5MxYWHA1VMt/Oj5eGL4HTlPmLuDjRecTWzmZ3peSqxa4Z23h1/zzUdeiyI3hP4R+ChPNe4wOjRuvjLonn2mZvqa3KCuyl9Oq+f33gZfRs4bQ7M3iblEawXpd2OBEhaUgS8DYzmHYB9RWpr+/v2KlrV68ekoszvcfpk0Z+KPepIiHhMKawsmqYyxD+FjToOOVXI3pCss5T7Gv/XTpRhdDsNe7SDZSbHE8eY7Sm8qUQI39GpXIXVEmoqJxEJ0JrSZ8URFChc8FD0gW9B/2K/ksD1mupLh9nHEzbw0ETxwae2L9SWFd2zoX5B+tAVE9Vk5kLDhEa51Imn810+j5GKoNeGXQmJKVaUawQsBkKqyyKLSw6lz+vZGL4xE7My7DFVDq8r7TYbcCQM3oRULdJwoV7sAwrkVMS5VvWloo/nGVU1IbOREHenm5Qnts3p1BOilJy4E56lXWMcT53+s8wvuZY= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?kCFvyiBF9eLjShdedHfODG9ZOLiSSo2+MrgP7vuD3kluIXVBYqwyNvUK2/I2?= =?us-ascii?Q?/Zvck2pJ7v8qC448qxRgIwuiNdXfWUo84nX0C4skEgoTvKSdBlFfBdro+wC3?= =?us-ascii?Q?XcGam5XhPHFi1gpN/eJtsM4LdIuoZkFrKMDR62NHCVOiV81zRRQ05BFRBjXW?= =?us-ascii?Q?0LIp3Ey31/QZe23pwkPZn6dukzMN/SxcYFfL9Nxc9ieEDVP9ODPncOqNqgjp?= =?us-ascii?Q?uRO0VoPpSQMRi0p2Lls0z/8KiunRi4AeEOJHCrvYYvTjSoVCcvNeikoxpiqg?= =?us-ascii?Q?r7Hy7Y1DHYxFGIbBmD9dZmsG76UjX+h3t74T5lceZDFj2UGtG0k5Fy8yechv?= =?us-ascii?Q?SEsI2p5Ufgw6JDQPwzoL7N9Fbssj+GSYnir+ro3gYx6aMbZukdr848j5L/Le?= =?us-ascii?Q?6IuX//6xwgFT0eLjRI2mvqFxWfcXBpnoyFpaj98NSfRKih2F5h6QUfRXzbqV?= =?us-ascii?Q?w5sTEvujXZ98gaQH50FPUpg++Z8WrDfR1foIqZ4nSSUIG21dFzWwaINBBKBu?= =?us-ascii?Q?8xDfZV0j0tnYVcwbbwY05yjKw4cxkmxkPWihFzLVH5gkkxCb8hL0WXjW45eA?= =?us-ascii?Q?Vhb4bhHHNRto0RYrMP2BnQP472aezsUJcypO3dYSlnSJ+Y+MOJDU2nU8q7PE?= =?us-ascii?Q?bDoH9vt3acDVvG7Q/U5W8maWQd4gFUPE5sc02TnrUqqJ+bkvNzGhFHLHvv0e?= =?us-ascii?Q?8/JZ+97FKRe/GV9gk22BYj6C/+EFKCsyJT4Bp4TB2ab9Y2b1CwzBupL0PP4B?= =?us-ascii?Q?E/eF3qIwYOFLm5K/7BUONS16mWH9I1V1axLBJmdN/NYfD0ZwvygvqZlNcEQQ?= =?us-ascii?Q?BSYSEPO5eXt/x8kuprPEzLG0avM0VwZhcEZSJwdUfGcBQ/LaOUgmODU4TFZd?= =?us-ascii?Q?4yKiiqVE7uMUR5DlY9bV4oQabBtaYJueBRWIE1TB2xAaaThMPAndFcDB0+SB?= =?us-ascii?Q?Y7BXx6xNwoWDTSDRSZf+N2pKeBRJiDt/1RkPCjleyMnK5Dz/mF040UtFnGxz?= =?us-ascii?Q?1clM6u7h8YC7ecI+Ne7uItVHdAmNmXkR2tsS/26ppfNV+P9s/fjXLtk+PhGQ?= =?us-ascii?Q?YScm0bburCSSdTQ+6L/sioNfWAstq+ElAl1zcvQiZdP7FAwGTkoZBd0wl0jK?= =?us-ascii?Q?+LjJ35nG6pjOo7WiiZa7HtLbjlBPMwt8yxC7dlKutbWwAopTyI/ubQUeI8ag?= =?us-ascii?Q?UYxKAe6U0nz/Fm3dMcD/dd35omc5ud+2HxCu7Fdip9KzErCvWkgit+Lc05Hv?= =?us-ascii?Q?W0TXmAmodx7YwfEDTXVNZrvFkiN/m/yzAyY+7wZXpLzd8t3+hglvcaWNPWgv?= =?us-ascii?Q?3wtOIoSVUmke+szlLd/8+W+hPPSERYZVT6F3f/km5xVxCENJpF2ZCjorPqd2?= =?us-ascii?Q?3LYgvNz2zjxHqr2VgKrB2NpCA6WT/XJ72F2S3HLmbkdWQttn8C9cbiKToaio?= =?us-ascii?Q?xaq7FghtaVrBmgHI0Mdl1ZUqh40SPU0M6l4k3GkaI4N/3D9PKaJdJ0Ku7FU5?= =?us-ascii?Q?FvJrc12DugyAIduPDrXkF+9Syt1OGdqOJbPDoA0ytjwiBqdraU7RL16+cVov?= =?us-ascii?Q?BQXgWTCTbJbLCHEcKPg=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 143c2d66-0581-4d0d-1774-08db8be93bec X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jul 2023 01:56:45.1414 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: FT+vqcZ0OpiU2ncCKibfhvBaRR6oQ6vvpUViZcTcexXpWjuSanpg5uDAt9BH2a6++nVFiJmhOtBSYmSup8hhDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4808 X-OriginatorOrg: intel.com Precedence: Bulk 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,ray.ni@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: sNX3mv48SCPYyKCcSVlbBQDax7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=oTrMtL0H; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Reviewed-by: Ray Ni > -----Original Message----- > From: Kinney, Michael D > Sent: Saturday, July 22, 2023 9:06 AM > To: devel@edk2.groups.io > Cc: Gerd Hoffmann ; Rebecca Cran ; > Andrew Fish ; Ni, Ray > Subject: [Patch 1/2] EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION > redefinition error >=20 > Update WinInclude.h to prevent error due to redefinition of > RUNTIME_FUNCTION using same technique that has been used > in the past for structure types such as LIST_ENTRY. >=20 > Cc: Gerd Hoffmann > Cc: Rebecca Cran > Cc: Andrew Fish > Cc: Ray Ni > Signed-off-by: Michael D Kinney > --- > EmulatorPkg/Win/Host/WinInclude.h | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) >=20 > diff --git a/EmulatorPkg/Win/Host/WinInclude.h > b/EmulatorPkg/Win/Host/WinInclude.h > index c2b6cfa3d658..877d2b0ed016 100644 > --- a/EmulatorPkg/Win/Host/WinInclude.h > +++ b/EmulatorPkg/Win/Host/WinInclude.h > @@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > // > // Win32 include files do not compile clean with /W4, so we use the warn= ing > -// pragma to suppress the warnings for Win32 only. This way our code can= stil > +// pragma to suppress the warnings for Win32 only. This way our code can= still > // compile at /W4 (highest warning level) with /WX (warnings cause build > // errors). > // > @@ -19,9 +19,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #pragma warning(disable : 4028) > #pragma warning(disable : 4133) >=20 > -#define GUID _WINNT_DUP_GUID_____ > -#define _LIST_ENTRY _WINNT_DUP_LIST_ENTRY_FORWARD > -#define LIST_ENTRY _WINNT_DUP_LIST_ENTRY > +#define GUID _WINNT_DUP_GUID_____ > +#define _LIST_ENTRY _WINNT_DUP_LIST_ENTRY_FORWARD > +#define LIST_ENTRY _WINNT_DUP_LIST_ENTRY > +#define RUNTIME_FUNCTION _WINNT_DUP_RUNTIME_FUNCTION > #if defined (MDE_CPU_IA32) && (_MSC_VER < 1800) > #define InterlockedIncrement _WINNT_DUP_InterlockedIncrement > #define InterlockedDecrement _WINNT_DUP_InterlockedDecrement > @@ -45,6 +46,7 @@ typedef UINT32 size_t; > #undef GUID > #undef _LIST_ENTRY > #undef LIST_ENTRY > +#undef RUNTIME_FUNCTION > #undef InterlockedIncrement > #undef InterlockedDecrement > #undef InterlockedCompareExchange64 > -- > 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 (#107151): https://edk2.groups.io/g/devel/message/107151 Mute This Topic: https://groups.io/mt/100288521/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-