summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-11-25 21:37:23 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2014-11-25 21:39:25 +0100
commitf8c05e53c43832bb7594f23e2201bbd9f20abcc6 (patch)
tree80bbd9ad6adcc56d1d2675bae2f30c6c367f3356 /src
parentMerge pull request #147 from yuriks/error-codes (diff)
downloadyuzu-f8c05e53c43832bb7594f23e2201bbd9f20abcc6.tar
yuzu-f8c05e53c43832bb7594f23e2201bbd9f20abcc6.tar.gz
yuzu-f8c05e53c43832bb7594f23e2201bbd9f20abcc6.tar.bz2
yuzu-f8c05e53c43832bb7594f23e2201bbd9f20abcc6.tar.lz
yuzu-f8c05e53c43832bb7594f23e2201bbd9f20abcc6.tar.xz
yuzu-f8c05e53c43832bb7594f23e2201bbd9f20abcc6.tar.zst
yuzu-f8c05e53c43832bb7594f23e2201bbd9f20abcc6.zip
Diffstat (limited to 'src')
-rw-r--r--src/common/log_manager.cpp1
-rw-r--r--src/core/arm/skyeye_common/armcpu.h2
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 @@
#include "common/log_manager.h"
#include "common/console_listener.h"
#include "common/timer.h"
-#include "common/thread.h"
void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line,
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 @@
#include <stddef.h>
#include <stdio.h>
-#include "common/thread.h"
-
#include "core/arm/skyeye_common/armdefs.h"
typedef struct ARM_CPU_State_s {