diff options
| author | 2014-11-26 16:25:23 -0500 | |
|---|---|---|
| committer | 2014-11-26 16:25:23 -0500 | |
| commit | 2a4b698f8e89f412e725b47fac77cedc5645bc37 (patch) | |
| tree | 80bbd9ad6adcc56d1d2675bae2f30c6c367f3356 /src | |
| parent | Merge pull request #147 from yuriks/error-codes (diff) | |
| parent | Remove unused includes to common/thread.h (diff) | |
| download | yuzu-2a4b698f8e89f412e725b47fac77cedc5645bc37.tar.gz yuzu-2a4b698f8e89f412e725b47fac77cedc5645bc37.tar.xz yuzu-2a4b698f8e89f412e725b47fac77cedc5645bc37.zip | |
Merge pull request #223 from linkmauve/remove-thread
Remove unused includes to common/thread.h
Diffstat (limited to '')
| -rw-r--r-- | src/common/log_manager.cpp | 1 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/armcpu.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index 38c681ee0..2ef7d98c0 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include "common/log_manager.h" | 7 | #include "common/log_manager.h" |
| 8 | #include "common/console_listener.h" | 8 | #include "common/console_listener.h" |
| 9 | #include "common/timer.h" | 9 | #include "common/timer.h" |
| 10 | #include "common/thread.h" | ||
| 11 | 10 | ||
| 12 | void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, | 11 | void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line, |
| 13 | const char* function, const char* fmt, ...) | 12 | const char* function, const char* fmt, ...) |
diff --git a/src/core/arm/skyeye_common/armcpu.h b/src/core/arm/skyeye_common/armcpu.h index 3a029f0e7..2b756c5bc 100644 --- a/src/core/arm/skyeye_common/armcpu.h +++ b/src/core/arm/skyeye_common/armcpu.h | |||
| @@ -24,8 +24,6 @@ | |||
| 24 | #include <stddef.h> | 24 | #include <stddef.h> |
| 25 | #include <stdio.h> | 25 | #include <stdio.h> |
| 26 | 26 | ||
| 27 | #include "common/thread.h" | ||
| 28 | |||
| 29 | #include "core/arm/skyeye_common/armdefs.h" | 27 | #include "core/arm/skyeye_common/armdefs.h" |
| 30 | 28 | ||
| 31 | typedef struct ARM_CPU_State_s { | 29 | typedef struct ARM_CPU_State_s { |