From a88cd5dec78830cae98d146434ab6e8b764c5400 Mon Sep 17 00:00:00 2001
From: Wunk <wunkolo@gmail.com>
Date: Mon, 23 Mar 2026 00:49:13 -0700
Subject: [PATCH] [a64] Fix MSVC-ARM64 `MemoryBarrier` preprocessor conflict
 (#927)

Fixes a build error on MSVC when building for ARM.
---
 src/xenia/cpu/hir/hir_builder.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/xenia/cpu/hir/hir_builder.h b/src/xenia/cpu/hir/hir_builder.h
index 91c6ad4c0..2621148ef 100644
--- a/src/xenia/cpu/hir/hir_builder.h
+++ b/src/xenia/cpu/hir/hir_builder.h
@@ -24,6 +24,11 @@
 #include "xenia/cpu/hir/value.h"
 #include "xenia/cpu/mmio_handler.h"
 
+#if defined(XE_COMPILER_MSVC) && defined(XE_ARCH_ARM64)
+// winnt.h defines `MemoryBarrier` as a macro on ARM-MSVC
+#undef MemoryBarrier
+#endif
+
 namespace xe {
 namespace cpu {
 namespace hir {