Avoid duplicate definition of CONTEXT_UNWOUND_TO_CALL with SDK v10.0.28000.0#5866
Merged
Conversation
…28000.0 This macro is now defined by the Windows SDK if on v10.0.28000.0 or later, so we need to avoid the redefinition error. Port of dotnet/runtime#127161. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR prevents /WX build breaks with Windows SDK v10.0.28000.0+ by avoiding duplicate macro definitions of CONTEXT_UNWOUND_TO_CALL in crosscomp.h during cross-compilation scenarios.
Changes:
- Wrapped three previously unguarded
#define CONTEXT_UNWOUND_TO_CALLsites with#ifndef/#endif(ARM64, LOONGARCH64, RISCV64 cross-compilation blocks). - Aligns these sections with the existing guarded pattern already used elsewhere in the file.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
steveisok
approved these changes
Jun 8, 2026
Member
Author
|
Fixed runtime-diagnostics pipeline: https://dev.azure.com/dnceng-public/public/_build/results?buildId=1454400&view=results |
hoyosjs
approved these changes
Jun 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note
This PR was AI/Copilot-generated.
This macro is now defined by the Windows SDK on v10.0.28000.0 or later, so we need to guard against the redefinition to avoid a build error when compiling with
/WX.Adds
#ifndef/#endifguards around the three unguarded#define CONTEXT_UNWOUND_TO_CALLsites (ARM64, LOONGARCH64, RISCV64 cross-compilation sections). The ARM section already had guards.Port of dotnet/runtime#127161.