diff options
| author | bunnei <bunneidev@gmail.com> | 2018-07-10 09:12:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 09:12:52 -0700 |
| commit | 04524e76c2694def4a2f1f4279ad2a2db787c775 (patch) | |
| tree | 5cf6c1ba860712810a378ab1c678692fc4124db7 /src/common/common_funcs.h | |
| parent | 3e966be6fcab0fd7d3ce8f9645dd6c42355c5632 (diff) | |
| parent | 70a6691e3be2fa7178c1c6cb43ed4435cbabdd0c (diff) | |
Merge pull request #633 from FearlessTobi/port-defines
Port #3579 from Citra: Clean up architecture-specific defines
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 4 |
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) |