diff options
| author |  bunnei | 2018-07-10 09:12:52 -0700 |
|---|---|---|
| committer |  GitHub | 2018-07-10 09:12:52 -0700 |
| commit | 04524e76c2694def4a2f1f4279ad2a2db787c775 (patch) | |
| tree | 5cf6c1ba860712810a378ab1c678692fc4124db7 /src/common/common_funcs.h | |
| parent | Merge pull request #642 from bunnei/create-save-dir (diff) | |
| parent | Port #3579 from Citra (diff) | |
| download | yuzu-04524e76c2694def4a2f1f4279ad2a2db787c775.tar.gz yuzu-04524e76c2694def4a2f1f4279ad2a2db787c775.tar.xz yuzu-04524e76c2694def4a2f1f4279ad2a2db787c775.zip | |
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 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #if !defined(ARCHITECTURE_x86_64) && !defined(_M_ARM) | 7 | #if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) |
| 8 | #include <cstdlib> // for exit | 8 | #include <cstdlib> // for exit |
| 9 | #endif | 9 | #endif |
| 10 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| @@ -30,7 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #ifdef ARCHITECTURE_x86_64 | 31 | #ifdef ARCHITECTURE_x86_64 |
| 32 | #define Crash() __asm__ __volatile__("int $3") | 32 | #define Crash() __asm__ __volatile__("int $3") |
| 33 | #elif defined(_M_ARM) | 33 | #elif defined(ARCHITECTURE_ARM) |
| 34 | #define Crash() __asm__ __volatile__("trap") | 34 | #define Crash() __asm__ __volatile__("trap") |
| 35 | #else | 35 | #else |
| 36 | #define Crash() exit(1) | 36 | #define Crash() exit(1) |