diff options
| author |  bunnei | 2014-12-12 23:20:01 -0500 |
|---|---|---|
| committer | bunnei | 2014-12-12 23:20:01 -0500 |
| commit | af1cd769e7b407af71496e788e218add31f8b2b0 (patch) | |
| tree | 1e3fd71256c04a15970b09abd3f7280f8b1ff678 /src/common/common_funcs.h | |
| parent | Merge pull request #267 from bunnei/apt-shared-font (diff) | |
| parent | Remove old logging system (diff) | |
| download | yuzu-af1cd769e7b407af71496e788e218add31f8b2b0.tar.gz yuzu-af1cd769e7b407af71496e788e218add31f8b2b0.tar.xz yuzu-af1cd769e7b407af71496e788e218add31f8b2b0.zip | |
Merge pull request #258 from yuriks/log-ng
New logging system
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index db041780a..67b3679b0 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include "common_types.h" | 7 | #include "common_types.h" |
| 8 | #include <cstdlib> | ||
| 8 | 9 | ||
| 9 | #ifdef _WIN32 | 10 | #ifdef _WIN32 |
| 10 | #define SLEEP(x) Sleep(x) | 11 | #define SLEEP(x) Sleep(x) |
| @@ -39,8 +40,6 @@ template<> struct CompileTimeAssert<true> {}; | |||
| 39 | #include <sys/endian.h> | 40 | #include <sys/endian.h> |
| 40 | #endif | 41 | #endif |
| 41 | 42 | ||
| 42 | #include "common_types.h" | ||
| 43 | |||
| 44 | // go to debugger mode | 43 | // go to debugger mode |
| 45 | #ifdef GEKKO | 44 | #ifdef GEKKO |
| 46 | #define Crash() | 45 | #define Crash() |