summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-09-09 02:16:32 +0200
committerarchshift <admin@archshift.com>2014-09-09 02:25:43 +0200
commit9d7cc2bedc55b1d1327645b9c816eea3bcd5d658 (patch)
tree009f6afaf127c8c77730222a5d015b150d7885e2
parentMerge pull request #95 from lioncash/disassembler (diff)
downloadyuzu-9d7cc2bedc55b1d1327645b9c816eea3bcd5d658.tar
yuzu-9d7cc2bedc55b1d1327645b9c816eea3bcd5d658.tar.gz
yuzu-9d7cc2bedc55b1d1327645b9c816eea3bcd5d658.tar.bz2
yuzu-9d7cc2bedc55b1d1327645b9c816eea3bcd5d658.tar.lz
yuzu-9d7cc2bedc55b1d1327645b9c816eea3bcd5d658.tar.xz
yuzu-9d7cc2bedc55b1d1327645b9c816eea3bcd5d658.tar.zst
yuzu-9d7cc2bedc55b1d1327645b9c816eea3bcd5d658.zip
-rw-r--r--src/common/console_listener.cpp6
-rw-r--r--src/common/file_search.cpp4
-rw-r--r--src/common/file_util.cpp7
-rw-r--r--src/common/log_manager.cpp1
-rw-r--r--src/common/math_util.cpp3
-rw-r--r--src/common/mem_arena.cpp4
-rw-r--r--src/common/memory_util.cpp3
-rw-r--r--src/common/string_util.cpp4
-rw-r--r--src/common/thread.cpp1
-rw-r--r--src/common/utf8.cpp4
10 files changed, 3 insertions, 34 deletions
diff --git a/src/common/console_listener.cpp b/src/common/console_listener.cpp
index 27697ef1f..6a89edd44 100644
--- a/src/common/console_listener.cpp
+++ b/src/common/console_listener.cpp
@@ -3,14 +3,10 @@
// Refer to the license.txt file included.
#include <algorithm>
-#include <cmath>
-#include <cstdio>
-#include <string>
+
#ifdef _WIN32
#include <windows.h>
#include <array>
-#else
-#include <cstdarg>
#endif
#include "common/common.h"
diff --git a/src/common/file_search.cpp b/src/common/file_search.cpp
index a9d19477d..cd50ace75 100644
--- a/src/common/file_search.cpp
+++ b/src/common/file_search.cpp
@@ -4,15 +4,13 @@
#include "common/common.h"
-#include "common/common_paths.h"
+
#ifndef _WIN32
-#include <sys/types.h>
#include <dirent.h>
#else
#include <windows.h>
#endif
-#include <string>
#include <algorithm>
#include "common/file_search.h"
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index b6ff2e40b..04d222ca1 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -4,9 +4,7 @@
#include "common/common.h"
-#include "common/common_paths.h"
#include "common/file_util.h"
-#include "common/string_util.h"
#ifdef _WIN32
#include <windows.h>
@@ -16,10 +14,7 @@
#include <io.h>
#include <direct.h> // getcwd
#else
-#include <cerrno>
-#include <cstdlib>
#include <sys/param.h>
-#include <sys/types.h>
#include <dirent.h>
#endif
@@ -32,8 +27,6 @@
#include <algorithm>
#include <sys/stat.h>
-#include "common/string_util.h"
-
#ifndef S_ISDIR
#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR)
#endif
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp
index 4e1cb60bd..c2b5d0e2c 100644
--- a/src/common/log_manager.cpp
+++ b/src/common/log_manager.cpp
@@ -8,7 +8,6 @@
#include "common/console_listener.h"
#include "common/timer.h"
#include "common/thread.h"
-#include "common/file_util.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/common/math_util.cpp b/src/common/math_util.cpp
index 82eceab00..ab0e6b75c 100644
--- a/src/common/math_util.cpp
+++ b/src/common/math_util.cpp
@@ -6,8 +6,7 @@
#include "common/common.h"
#include "common/math_util.h"
-#include <cmath>
-#include <numeric>
+#include <numeric> // Necessary on OS X, but not Linux
namespace MathUtil
{
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp
index b76ac92d3..a456beb28 100644
--- a/src/common/mem_arena.cpp
+++ b/src/common/mem_arena.cpp
@@ -22,11 +22,7 @@
#include "common/string_util.h"
#ifndef _WIN32
-#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
-#include <cerrno>
-#include <cstring>
#ifdef ANDROID
#include <sys/ioctl.h>
#include <linux/ashmem.h>
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp
index e01e63175..45bf5a496 100644
--- a/src/common/memory_util.cpp
+++ b/src/common/memory_util.cpp
@@ -10,9 +10,6 @@
#ifdef _WIN32
#include <windows.h>
#include <psapi.h>
-#else
-#include <cerrno>
-#include <cstdio>
#endif
#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index c1f22bda3..a3c7f479e 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -3,17 +3,13 @@
// Refer to the license.txt file included.
#include <algorithm>
-#include <cstdlib>
-#include <cstdio>
#include "common/common.h"
-#include "common/common_paths.h"
#include "common/string_util.h"
#ifdef _WIN32
#include <Windows.h>
#else
- #include <cerrno>
#include <iconv.h>
#endif
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index 830795182..60d8ed075 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include "common/thread.h"
-#include "common/common.h"
#ifdef __APPLE__
#include <mach/mach.h>
diff --git a/src/common/utf8.cpp b/src/common/utf8.cpp
index c83824d35..be4ebc855 100644
--- a/src/common/utf8.cpp
+++ b/src/common/utf8.cpp
@@ -19,12 +19,8 @@
#endif
#include <cstdlib>
-#include <cstdio>
#include <cstring>
-#include <cstdarg>
-
#include <algorithm>
-#include <string>
#include "common/common_types.h"
#include "common/utf8.h"