EmulatorPkg/Win/Host/WinInclude.h | 10 ++++++---- MdePkg/Include/IndustryStandard/PeImage.h | 5 ----- 2 files changed, 6 insertions(+), 9 deletions(-)
Remove RUNTIME_FUNCTION redefinition error workaround from the following commit to the MdePkg that only impacts EmulatorPkg builds that uses windows include files: https://github.com/tianocore/edk2/commit/ff52068d9261b9391d75b83a2a4e40e040f3b6eb 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. Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Rebecca Cran <rebecca@bsdio.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Zhiguang Liu <zhiguang.liu@intel.com> Cc: Andrew Fish <afish@apple.com> Cc: Ray Ni <ray.ni@intel.com> Signed-off-by: Michael D Kinney michael.d.kinney@intel.com Michael D Kinney (2): EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION redefinition error MdePkg/Include/IndustryStandard: Remove VS20xx workaround EmulatorPkg/Win/Host/WinInclude.h | 10 ++++++---- MdePkg/Include/IndustryStandard/PeImage.h | 5 ----- 2 files changed, 6 insertions(+), 9 deletions(-) -- 2.40.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107136): https://edk2.groups.io/g/devel/message/107136 Mute This Topic: https://groups.io/mt/100288520/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
For the series: Reviewed-by: Rebecca Cran <rebecca@bsdio.com> On 7/21/23 19:06, Michael D Kinney wrote: > Remove RUNTIME_FUNCTION redefinition error workaround from > the following commit to the MdePkg that only impacts EmulatorPkg > builds that uses windows include files: > > https://github.com/tianocore/edk2/commit/ff52068d9261b9391d75b83a2a4e40e040f3b6eb > > 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. > > Cc: Gerd Hoffmann <kraxel@redhat.com> > Cc: Rebecca Cran <rebecca@bsdio.com> > Cc: Liming Gao <gaoliming@byosoft.com.cn> > Cc: Zhiguang Liu <zhiguang.liu@intel.com> > Cc: Andrew Fish <afish@apple.com> > Cc: Ray Ni <ray.ni@intel.com> > Signed-off-by: Michael D Kinney michael.d.kinney@intel.com > > Michael D Kinney (2): > EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION redefinition error > MdePkg/Include/IndustryStandard: Remove VS20xx workaround > > EmulatorPkg/Win/Host/WinInclude.h | 10 ++++++---- > MdePkg/Include/IndustryStandard/PeImage.h | 5 ----- > 2 files changed, 6 insertions(+), 9 deletions(-) > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107148): https://edk2.groups.io/g/devel/message/107148 Mute This Topic: https://groups.io/mt/100288520/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn> > -----邮件原件----- > 发件人: Michael D Kinney <michael.d.kinney@intel.com> > 发送时间: 2023年7月22日 9:06 > 收件人: devel@edk2.groups.io > 抄送: Gerd Hoffmann <kraxel@redhat.com>; Rebecca Cran > <rebecca@bsdio.com>; Liming Gao <gaoliming@byosoft.com.cn>; Zhiguang > Liu <zhiguang.liu@intel.com>; Andrew Fish <afish@apple.com>; Ray Ni > <ray.ni@intel.com> > 主题: [Patch 0/2] Move RUNTIME_FUNCTION redefintion fix to EmulatorPkg > > Remove RUNTIME_FUNCTION redefinition error workaround from > the following commit to the MdePkg that only impacts EmulatorPkg > builds that uses windows include files: > > https://github.com/tianocore/edk2/commit/ff52068d9261b9391d75b83a2a4 > e40e040f3b6eb > > 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. > > Cc: Gerd Hoffmann <kraxel@redhat.com> > Cc: Rebecca Cran <rebecca@bsdio.com> > Cc: Liming Gao <gaoliming@byosoft.com.cn> > Cc: Zhiguang Liu <zhiguang.liu@intel.com> > Cc: Andrew Fish <afish@apple.com> > Cc: Ray Ni <ray.ni@intel.com> > Signed-off-by: Michael D Kinney michael.d.kinney@intel.com > > Michael D Kinney (2): > EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION redefinition error > MdePkg/Include/IndustryStandard: Remove VS20xx workaround > > EmulatorPkg/Win/Host/WinInclude.h | 10 ++++++---- > MdePkg/Include/IndustryStandard/PeImage.h | 5 ----- > 2 files changed, 6 insertions(+), 9 deletions(-) > > -- > 2.40.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107147): https://edk2.groups.io/g/devel/message/107147 Mute This Topic: https://groups.io/mt/100321453/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.