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 B6DDC7803CC for ; Sat, 22 Jul 2023 01:06:35 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=jtwzV334Zyb45v+FnjSq7+AzQfYEX24toWdkPSkorJA=; 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=1689987994; v=1; b=UcuEJt9x2F8V9qHhNeICUm/H8NzkRbGkGzE+9Oh719QVzknYyH6kBBoJC0dZ1UxuRgbShbel V4Np0Kou+dvOqLaYEZh74P0w3G23cB3rx0mL4DSrbW2ySwviDrnmC0hy4uFixMXYUJsMtzp819b uIZtoiNcjpowsKBSbIXnVgts= X-Received: by 127.0.0.2 with SMTP id oRApYY7687511xZHQn8G6z55; Fri, 21 Jul 2023 18:06:34 -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:32 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="364608425" X-IronPort-AV: E=Sophos;i="6.01,223,1684825200"; d="scan'208";a="364608425" 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:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10778"; a="675222556" X-IronPort-AV: E=Sophos;i="6.01,223,1684825200"; d="scan'208";a="675222556" 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:31 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gerd Hoffmann , Rebecca Cran , Liming Gao , Zhiguang Liu Subject: [edk2-devel] [Patch 2/2] MdePkg/Include/IndustryStandard: Remove VS20xx workaround Date: Fri, 21 Jul 2023 18:06:22 -0700 Message-Id: <20230722010622.1708-3-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: 0VaikEfGPgbdGWeUvT5xK72nx7686176AA= 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=UcuEJt9x; 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 Remove workaround for the redefinition of the type RUNTIME_FUNCTION that is generated when building with VS20xx tool chains and using windows include files. The correct location for this fix is in the EmulatorPkg in the WinInclude.h file that addresses all the name collisions between edk2 types and windows types. The commit that added the workaround is: https://github.com/tianocore/edk2/commit/ff52068d9261b9391d75b83a2a4e40e040f3b6eb Cc: Gerd Hoffmann Cc: Rebecca Cran Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Michael D Kinney --- MdePkg/Include/IndustryStandard/PeImage.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/MdePkg/Include/IndustryStandard/PeImage.h b/MdePkg/Include/IndustryStandard/PeImage.h index 47037049348c..4840b8dd8a9e 100644 --- a/MdePkg/Include/IndustryStandard/PeImage.h +++ b/MdePkg/Include/IndustryStandard/PeImage.h @@ -678,9 +678,6 @@ typedef struct { // } EFI_IMAGE_DEBUG_CODEVIEW_MTOC_ENTRY; -// avoid conflict with windows header files -#ifndef RUNTIME_FUNCTION_INDIRECT - // // .pdata entries for X64 // @@ -690,8 +687,6 @@ typedef struct { UINT32 UnwindInfoAddress; } RUNTIME_FUNCTION; -#endif - typedef struct { UINT8 Version : 3; UINT8 Flags : 5; -- 2.40.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107138): https://edk2.groups.io/g/devel/message/107138 Mute This Topic: https://groups.io/mt/100288522/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-