summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar bunnei2014-05-20 22:26:40 -0400
committerGravatar bunnei2014-05-20 22:26:40 -0400
commita721a4eb33a06b532e36e5a49578abd8338d0d28 (patch)
tree5f0e0972a60edc773638cc3512aec8df9761c03a /src/core
parentarmemu: missed rename of "Syscall" to "SVC" (diff)
downloadyuzu-a721a4eb33a06b532e36e5a49578abd8338d0d28.tar.gz
yuzu-a721a4eb33a06b532e36e5a49578abd8338d0d28.tar.xz
yuzu-a721a4eb33a06b532e36e5a49578abd8338d0d28.zip
arm: removed include of windows.h from armdefs.h to arminit.c (only module that uses it)
Diffstat (limited to 'src/core')
-rw-r--r--src/core/arm/interpreter/armdefs.h4
-rw-r--r--src/core/arm/interpreter/arminit.cpp3
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 @@
24 24
25#include "common/platform.h" 25#include "common/platform.h"
26 26
27#if EMU_PLATFORM == PLATFORM_WINDOWS
28#include <windows.h>
29#endif
30
31//teawater add for arm2x86 2005.02.14------------------------------------------- 27//teawater add for arm2x86 2005.02.14-------------------------------------------
32// koodailar remove it for mingw 2005.12.18---------------- 28// koodailar remove it for mingw 2005.12.18----------------
33//anthonylee modify it for portable 2007.01.30 29//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 @@
17 17
18 18
19#include "common/platform.h" 19#include "common/platform.h"
20
20#if EMU_PLATFORM == PLATFORM_LINUX 21#if EMU_PLATFORM == PLATFORM_LINUX
21#include <unistd.h> 22#include <unistd.h>
23#elif EMU_PLATFORM == PLATFORM_WINDOWS
24#include <windows.h>
22#endif 25#endif
23 26
24#include <math.h> 27#include <math.h>