Skip to content

Fix arm64_unwind.h include-order#1665

Merged
flyinghead merged 1 commit intoflyinghead:masterfrom
Wunkolo:woa-include-fix
Oct 7, 2024
Merged

Fix arm64_unwind.h include-order#1665
flyinghead merged 1 commit intoflyinghead:masterfrom
Wunkolo:woa-include-fix

Conversation

@Wunkolo
Copy link
Contributor

@Wunkolo Wunkolo commented Oct 7, 2024

sh4_core.h has defines for symbols like r and pr which conflict with the variable names in arm64_unwind.h and cause even deeper errors over in wingdi.h(4954) and wincrypt.h(4741).
Swapping the include order avoids this collision.

Fixes Windows on ARM builds: #545

`sh4_core.h` has defines for symbols like `r` and `pr` which conflict with the variable names in `arm64_unwind.h` and cause even deeper errors over in `wingdi.h(4954)` and `wincrypt.h(4741)`.

Swapping the include order avoids this collision.
@flyinghead flyinghead merged commit 56fe3b9 into flyinghead:master Oct 7, 2024
@flyinghead
Copy link
Owner

Thanks!

@Wunkolo Wunkolo deleted the woa-include-fix branch October 7, 2024 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants