projects
/
platform
/
upstream
/
dotnet
/
runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9455436
)
Fix building CoreCLR for x86 with the Windows 10.0.20348.0 SDK (#57067)
author
Jeremy Koritzinsky
<jekoritz@microsoft.com>
Mon, 9 Aug 2021 20:36:13 +0000
(15:36 -0500)
committer
GitHub
<noreply@github.com>
Mon, 9 Aug 2021 20:36:13 +0000
(15:36 -0500)
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
patch
|
blob
|
history
diff --git
a/src/coreclr/inc/crosscomp.h
b/src/coreclr/inc/crosscomp.h
index
0874603
..
358b5d2
100644
(file)
--- 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 {