From 8e71c5f05058bc43c5572547daac11c3ebc54de2 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 9 Aug 2021 08:43:14 -0700 Subject: [PATCH] Fix building CoreCLR for x86 with the Windows 10.0.20348.0 SDK The SDK now defines CONTEXT_UNWOUND_TO_CALL in more cases, so we get a macro redefinition error. Since the SDK defines it to the same value as we do, just skip our definition if it's already defined. --- src/coreclr/inc/crosscomp.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/coreclr/inc/crosscomp.h b/src/coreclr/inc/crosscomp.h index 0874603640b3b0..358b5d2b668816 100644 --- a/src/coreclr/inc/crosscomp.h +++ b/src/coreclr/inc/crosscomp.h @@ -41,7 +41,9 @@ #define ARM_MAX_BREAKPOINTS 8 #define ARM_MAX_WATCHPOINTS 1 +#ifndef CONTEXT_UNWOUND_TO_CALL #define CONTEXT_UNWOUND_TO_CALL 0x20000000 +#endif #if !defined(HOST_ARM64) typedef struct _NEON128 {