diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-18 11:58:57 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-18 11:58:57 +1300 |
| commit | 8f0fa997cb4d704b531feba8b39f89f83f6faa0d (patch) | |
| tree | 3186a5c5cf100174e162a4ac72388624bb645770 /Source/Core | |
| parent | 8e45783d54177ddb0e50009d7ca9f84d82466aff (diff) | |
| parent | 3586ab1d4c9a1b892fcadef28877d2fe72aa9975 (diff) | |
Merge pull request #187 from Sonicadvance1/android-clang-fix
Fix the Android build when using clang 3.4
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/LogManager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/LogManager.h b/Source/Core/Common/LogManager.h index eb4f482c29..3bb9321528 100644 --- a/Source/Core/Common/LogManager.h +++ b/Source/Core/Common/LogManager.h @@ -6,10 +6,10 @@ #include <cstdarg> #include <fstream> -#include <mutex> #include <set> #include "Common/Common.h" +#include "Common/StdMutex.h" #define MAX_MESSAGES 8000 #define MAX_MSGLEN 1024 |