diff options
| author |  bunnei | 2014-05-22 22:57:45 -0400 |
|---|---|---|
| committer | bunnei | 2014-05-22 22:57:45 -0400 |
| commit | 32c314c99290a52f1f870ecf8c677e3792ed09c4 (patch) | |
| tree | 1cea62bc320d51ebb217e7c361ae10b65b71dd45 /src/core/arm/interpreter/arminit.cpp | |
| parent | Merge branch 'master' of https://github.com/citra-emu/citra (diff) | |
| parent | core: added Kernel::Reschedule() call to check for thread changes, shortened ... (diff) | |
| download | yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.gz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.xz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.zip | |
Merge branch 'threading'
Diffstat (limited to 'src/core/arm/interpreter/arminit.cpp')
| -rw-r--r-- | src/core/arm/interpreter/arminit.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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> |