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 1C9F8940D73 for ; Sat, 22 Jul 2023 01:06:33 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=X8KHCCMgDHdfO04fTiR9FYkp1mtrUKnJLa8WCJj3Umk=; 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:From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:X-Gm-Message-State:Content-Transfer-Encoding; s=20140610; t=1689987992; v=1; b=jYdprDQaJEbou3zGrx9+PyW5UP4JcPbdTsCDAMgReo7zdgczI5n9BUCPJWvx7Zx04Um87/aX JA/Dz8kzcS9hkSDDbs4oW9aPjzvDwa14FUZsGebrKTWfgbROfqkKy8p55ebbyW2g01LKXKXJSMB x7TL34vuTruxGQdkbZl5wDoc= X-Received: by 127.0.0.2 with SMTP id O7fFYY7687511x211pMgpvGk; Fri, 21 Jul 2023 18:06:32 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.21945.1689987991377979673 for ; Fri, 21 Jul 2023 18:06:31 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="364608412" X-IronPort-AV: E=Sophos;i="6.01,223,1684825200"; d="scan'208";a="364608412" X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 18:06:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="675222545" X-IronPort-AV: E=Sophos;i="6.01,223,1684825200"; d="scan'208";a="675222545" X-Received: from mdkinney-mobl.amr.corp.intel.com ([10.212.157.51]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2023 18:06:30 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Rebecca Cran , Andrew Fish , Ray Ni Subject: [edk2-devel] [Patch 1/2] EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION redefinition error Date: Fri, 21 Jul 2023 18:06:21 -0700 Message-Id: <20230722010622.1708-2-michael.d.kinney@intel.com> In-Reply-To: <20230722010622.1708-1-michael.d.kinney@intel.com> References: <20230722010622.1708-1-michael.d.kinney@intel.com> MIME-Version: 1.0 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,michael.d.kinney@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: kZSivqgxIn1c4qFsNANZAfnYx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=jYdprDQa; 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 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. 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(-) 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 // // Win32 include files do not compile clean with /W4, so we use the warning -// 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) -#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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107137): https://edk2.groups.io/g/devel/message/107137 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/1913456212/xyzzy [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-