From 56fe3b9c9d0ce44fb54fdf28cbcd1a984346fa30 Mon Sep 17 00:00:00 2001 From: Wunkolo Date: Sun, 6 Oct 2024 18:54:54 -0700 Subject: [PATCH] Fix `arm64_unwind.h` include-order `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. --- core/rec-ARM64/rec_arm64.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/rec-ARM64/rec_arm64.cpp b/core/rec-ARM64/rec_arm64.cpp index 50ec8f6f43..4051b59792 100644 --- a/core/rec-ARM64/rec_arm64.cpp +++ b/core/rec-ARM64/rec_arm64.cpp @@ -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