summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael D Kinney <michael.d.kinney@intel.com>2023-07-21 08:57:23 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-07-24 03:57:52 +0000
commitdcf05f958eb409095bf330cf8b8f12fe4c940880 (patch)
treea263a2e8ed3de299694adc48f828e89c9cee73e4
parent5309ddc83bd51740dd28a3ba253a0ae9999738f0 (diff)
downloadedk2-dcf05f958eb409095bf330cf8b8f12fe4c940880.tar.gz
edk2-dcf05f958eb409095bf330cf8b8f12fe4c940880.tar.bz2
edk2-dcf05f958eb409095bf330cf8b8f12fe4c940880.zip
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 <kraxel@redhat.com> Cc: Rebecca Cran <rebecca@bsdio.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Zhiguang Liu <zhiguang.liu@intel.com> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn> Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
-rw-r--r--MdePkg/Include/IndustryStandard/PeImage.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/MdePkg/Include/IndustryStandard/PeImage.h b/MdePkg/Include/IndustryStandard/PeImage.h
index 4703704934..4840b8dd8a 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;