diff options
| author |  Yuri Kunde Schlesner | 2015-05-07 11:45:45 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-07 11:45:45 -0700 |
| commit | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (patch) | |
| tree | a180a736708834708e0e5b95fd1720f37722b429 /src/common/misc.cpp | |
| parent | Merge pull request #695 from Subv/crash_f (diff) | |
| parent | Fix printf format warning (diff) | |
| download | yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.gz yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.xz yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.zip | |
Merge pull request #721 from yuriks/more-cleanups
More cleanups
Diffstat (limited to 'src/common/misc.cpp')
| -rw-r--r-- | src/common/misc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/misc.cpp b/src/common/misc.cpp index e33055d10..53cacf37c 100644 --- a/src/common/misc.cpp +++ b/src/common/misc.cpp | |||
| @@ -2,10 +2,12 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "common/common.h" | 5 | #include "common/common_funcs.h" |
| 6 | 6 | ||
| 7 | #ifdef _WIN32 | 7 | #ifdef _WIN32 |
| 8 | #include <windows.h> | 8 | #include <windows.h> |
| 9 | #else | ||
| 10 | #include <string.h> | ||
| 9 | #endif | 11 | #endif |
| 10 | 12 | ||
| 11 | // Neither Android nor OS X support TLS | 13 | // Neither Android nor OS X support TLS |