diff options
author | bunnei <ericbunnie@gmail.com> | 2014-05-21 04:26:40 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-05-21 04:26:40 +0200 |
commit | a721a4eb33a06b532e36e5a49578abd8338d0d28 (patch) | |
tree | 5f0e0972a60edc773638cc3512aec8df9761c03a /src | |
parent | armemu: missed rename of "Syscall" to "SVC" (diff) | |
download | yuzu-a721a4eb33a06b532e36e5a49578abd8338d0d28.tar yuzu-a721a4eb33a06b532e36e5a49578abd8338d0d28.tar.gz yuzu-a721a4eb33a06b532e36e5a49578abd8338d0d28.tar.bz2 yuzu-a721a4eb33a06b532e36e5a49578abd8338d0d28.tar.lz yuzu-a721a4eb33a06b532e36e5a49578abd8338d0d28.tar.xz yuzu-a721a4eb33a06b532e36e5a49578abd8338d0d28.tar.zst yuzu-a721a4eb33a06b532e36e5a49578abd8338d0d28.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/arm/interpreter/armdefs.h | 4 | ||||
-rw-r--r-- | src/core/arm/interpreter/arminit.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/arm/interpreter/armdefs.h b/src/core/arm/interpreter/armdefs.h index 5b2abc7f7..d8eae4d3f 100644 --- a/src/core/arm/interpreter/armdefs.h +++ b/src/core/arm/interpreter/armdefs.h @@ -24,10 +24,6 @@ #include "common/platform.h" -#if EMU_PLATFORM == PLATFORM_WINDOWS -#include <windows.h> -#endif - //teawater add for arm2x86 2005.02.14------------------------------------------- // koodailar remove it for mingw 2005.12.18---------------- //anthonylee modify it for portable 2007.01.30 diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp index 2c771cdda..e05667bea 100644 --- a/src/core/arm/interpreter/arminit.cpp +++ b/src/core/arm/interpreter/arminit.cpp @@ -17,8 +17,11 @@ #include "common/platform.h" + #if EMU_PLATFORM == PLATFORM_LINUX #include <unistd.h> +#elif EMU_PLATFORM == PLATFORM_WINDOWS +#include <windows.h> #endif #include <math.h> |