Skip to content

Commit

Permalink
Fix arm64_unwind.h include-order
Browse files Browse the repository at this point in the history
`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.
  • Loading branch information
Wunkolo authored and flyinghead committed Oct 7, 2024
1 parent 30bb864 commit 56fe3b9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/rec-ARM64/rec_arm64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ using namespace vixl::aarch64;

#include "hw/sh4/sh4_mmr.h"
#include "hw/sh4/sh4_interrupts.h"
#include "arm64_unwind.h"
#include "hw/sh4/sh4_core.h"
#include "hw/sh4/dyna/ngen.h"
#include "hw/sh4/sh4_mem.h"
#include "hw/sh4/sh4_rom.h"
#include "arm64_regalloc.h"
#include "hw/mem/addrspace.h"
#include "arm64_unwind.h"
#include "oslib/virtmem.h"

#undef do_sqw_nommu
Expand Down

0 comments on commit 56fe3b9

Please sign in to comment.