Branch: refs/heads/master Home: https://github.com/tianocore/edk2 Commit: 5309ddc83bd51740dd28a3ba253a0ae9999738f0 https://github.com/tianocore/edk2/commit/5309ddc83bd51740dd28a3ba253a0ae9999738f0 Author: Michael D Kinney <michael.d.kin...@intel.com> Date: 2023-07-24 (Mon, 24 Jul 2023)
Changed paths: M EmulatorPkg/Win/Host/WinInclude.h Log Message: ----------- EmulatorPkg/Win/Host: Fix RUNTIME_FUNCTION redefinition error 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 <kra...@redhat.com> Cc: Rebecca Cran <rebe...@bsdio.com> Cc: Andrew Fish <af...@apple.com> Cc: Ray Ni <ray...@intel.com> Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com> Reviewed-by: Ray Ni <ray...@intel.com> Reviewed-by: Liming Gao <gaolim...@byosoft.com.cn> Reviewed-by: Rebecca Cran <rebe...@bsdio.com> Commit: dcf05f958eb409095bf330cf8b8f12fe4c940880 https://github.com/tianocore/edk2/commit/dcf05f958eb409095bf330cf8b8f12fe4c940880 Author: Michael D Kinney <michael.d.kin...@intel.com> Date: 2023-07-24 (Mon, 24 Jul 2023) Changed paths: M MdePkg/Include/IndustryStandard/PeImage.h Log Message: ----------- MdePkg/Include/IndustryStandard: Remove VS20xx workaround 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 <kra...@redhat.com> Cc: Rebecca Cran <rebe...@bsdio.com> Cc: Liming Gao <gaolim...@byosoft.com.cn> Cc: Zhiguang Liu <zhiguang....@intel.com> Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com> Reviewed-by: Liming Gao <gaolim...@byosoft.com.cn> Reviewed-by: Rebecca Cran <rebe...@bsdio.com> Compare: https://github.com/tianocore/edk2/compare/925c445fd37b...dcf05f958eb4 _______________________________________________ edk2-commits mailing list edk2-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-commits