summaryrefslogtreecommitdiffstats
path: root/src/common/common_funcs.h
diff options
context:
space:
mode:
authorfearlessTobi <thm.frey@gmail.com>2018-07-07 13:59:18 +0200
committerfearlessTobi <thm.frey@gmail.com>2018-07-07 13:59:18 +0200
commit70a6691e3be2fa7178c1c6cb43ed4435cbabdd0c (patch)
treed383e9925ec3fe864f75a3feba1896eec41689b3 /src/common/common_funcs.h
parentMerge pull request #631 from lioncash/dynarmic (diff)
downloadyuzu-70a6691e3be2fa7178c1c6cb43ed4435cbabdd0c.tar
yuzu-70a6691e3be2fa7178c1c6cb43ed4435cbabdd0c.tar.gz
yuzu-70a6691e3be2fa7178c1c6cb43ed4435cbabdd0c.tar.bz2
yuzu-70a6691e3be2fa7178c1c6cb43ed4435cbabdd0c.tar.lz
yuzu-70a6691e3be2fa7178c1c6cb43ed4435cbabdd0c.tar.xz
yuzu-70a6691e3be2fa7178c1c6cb43ed4435cbabdd0c.tar.zst
yuzu-70a6691e3be2fa7178c1c6cb43ed4435cbabdd0c.zip
Diffstat (limited to '')
-rw-r--r--src/common/common_funcs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 7cf7b7997..995938d0b 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -4,7 +4,7 @@
#pragma once
-#if !defined(ARCHITECTURE_x86_64) && !defined(_M_ARM)
+#if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM)
#include <cstdlib> // for exit
#endif
#include "common/common_types.h"
@@ -30,7 +30,7 @@
#ifdef ARCHITECTURE_x86_64
#define Crash() __asm__ __volatile__("int $3")
-#elif defined(_M_ARM)
+#elif defined(ARCHITECTURE_ARM)
#define Crash() __asm__ __volatile__("trap")
#else
#define Crash() exit(1)