1
0
Fork 0
forked from suyu/suyu

Merge pull request #103 from archshift/prune

Prune redundant includes
This commit is contained in:
bunnei 2014-09-10 18:44:08 -04:00
commit d79fe3ebaa
30 changed files with 3 additions and 71 deletions

View file

@ -3,14 +3,10 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm> #include <algorithm>
#include <cmath>
#include <cstdio>
#include <string>
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <array> #include <array>
#else
#include <cstdarg>
#endif #endif
#include "common/common.h" #include "common/common.h"

View file

@ -4,15 +4,13 @@
#include "common/common.h" #include "common/common.h"
#include "common/common_paths.h"
#ifndef _WIN32 #ifndef _WIN32
#include <sys/types.h>
#include <dirent.h> #include <dirent.h>
#else #else
#include <windows.h> #include <windows.h>
#endif #endif
#include <string>
#include <algorithm> #include <algorithm>
#include "common/file_search.h" #include "common/file_search.h"

View file

@ -4,9 +4,7 @@
#include "common/common.h" #include "common/common.h"
#include "common/common_paths.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "common/string_util.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
@ -16,10 +14,7 @@
#include <io.h> #include <io.h>
#include <direct.h> // getcwd #include <direct.h> // getcwd
#else #else
#include <cerrno>
#include <cstdlib>
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h>
#include <dirent.h> #include <dirent.h>
#endif #endif
@ -32,8 +27,6 @@
#include <algorithm> #include <algorithm>
#include <sys/stat.h> #include <sys/stat.h>
#include "common/string_util.h"
#ifndef S_ISDIR #ifndef S_ISDIR
#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR)
#endif #endif

View file

@ -8,7 +8,6 @@
#include "common/console_listener.h" #include "common/console_listener.h"
#include "common/timer.h" #include "common/timer.h"
#include "common/thread.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, void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line,
const char* function, const char* fmt, ...) const char* function, const char* fmt, ...)

View file

@ -6,8 +6,7 @@
#include "common/common.h" #include "common/common.h"
#include "common/math_util.h" #include "common/math_util.h"
#include <cmath> #include <numeric> // Necessary on OS X, but not Linux
#include <numeric>
namespace MathUtil namespace MathUtil
{ {

View file

@ -22,11 +22,7 @@
#include "common/string_util.h" #include "common/string_util.h"
#ifndef _WIN32 #ifndef _WIN32
#include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h>
#include <cerrno>
#include <cstring>
#ifdef ANDROID #ifdef ANDROID
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/ashmem.h> #include <linux/ashmem.h>

View file

@ -10,9 +10,6 @@
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <psapi.h> #include <psapi.h>
#else
#include <cerrno>
#include <cstdio>
#endif #endif
#if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT)

View file

@ -3,17 +3,13 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm> #include <algorithm>
#include <cstdlib>
#include <cstdio>
#include "common/common.h" #include "common/common.h"
#include "common/common_paths.h"
#include "common/string_util.h" #include "common/string_util.h"
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>
#else #else
#include <cerrno>
#include <iconv.h> #include <iconv.h>
#endif #endif

View file

@ -3,7 +3,6 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/thread.h" #include "common/thread.h"
#include "common/common.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <mach/mach.h> #include <mach/mach.h>

View file

@ -19,12 +19,8 @@
#endif #endif
#include <cstdlib> #include <cstdlib>
#include <cstdio>
#include <cstring> #include <cstring>
#include <cstdarg>
#include <algorithm> #include <algorithm>
#include <string>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/utf8.h" #include "common/utf8.h"

View file

@ -6,7 +6,6 @@
#include <vector> #include <vector>
#include "common/symbols.h" #include "common/symbols.h"
#include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "core/arm/disassembler/load_symbol_map.h" #include "core/arm/disassembler/load_symbol_map.h"

View file

@ -3,15 +3,9 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/common_types.h" #include "common/common_types.h"
#include "common/log.h"
#include "common/symbols.h"
#include "video_core/video_core.h"
#include "core/core.h" #include "core/core.h"
#include "core/mem_map.h"
#include "core/hw/hw.h" #include "core/hw/hw.h"
#include "core/hw/gpu.h"
#include "core/arm/disassembler/arm_disasm.h" #include "core/arm/disassembler/arm_disasm.h"
#include "core/arm/interpreter/arm_interpreter.h" #include "core/arm/interpreter/arm_interpreter.h"

View file

@ -3,7 +3,6 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/common_types.h" #include "common/common_types.h"
#include "common/log.h"
#include "core/hle/config_mem.h" #include "core/hle/config_mem.h"

View file

@ -5,7 +5,6 @@
#include "core/hle/coprocessor.h" #include "core/hle/coprocessor.h"
#include "core/hle/hle.h" #include "core/hle/hle.h"
#include "core/mem_map.h" #include "core/mem_map.h"
#include "core/core.h"
namespace HLE { namespace HLE {

View file

@ -6,7 +6,6 @@
#include "core/mem_map.h" #include "core/mem_map.h"
#include "core/hle/hle.h" #include "core/hle/hle.h"
#include "core/hle/svc.h"
#include "core/hle/kernel/thread.h" #include "core/hle/kernel/thread.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"

View file

@ -7,7 +7,6 @@
#include "core/file_sys/archive.h" #include "core/file_sys/archive.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/archive.h" #include "core/hle/kernel/archive.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

View file

@ -2,8 +2,6 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <string.h>
#include "common/common.h" #include "common/common.h"
#include "core/core.h" #include "core/core.h"

View file

@ -3,10 +3,8 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm> #include <algorithm>
#include <cstdio>
#include <list> #include <list>
#include <map> #include <map>
#include <string>
#include <vector> #include <vector>
#include "common/common.h" #include "common/common.h"
@ -15,7 +13,6 @@
#include "core/core.h" #include "core/core.h"
#include "core/mem_map.h" #include "core/mem_map.h"
#include "core/hle/hle.h" #include "core/hle/hle.h"
#include "core/hle/svc.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/thread.h" #include "core/hle/kernel/thread.h"

View file

@ -4,8 +4,6 @@
#include "common/common.h" #include "common/common.h"
#include "core/loader/loader.h"
#include "core/hle/hle.h"
#include "core/hle/service/fs.h" #include "core/hle/service/fs.h"
#include "core/hle/kernel/archive.h" #include "core/hle/kernel/archive.h"

View file

@ -7,7 +7,6 @@
#include "common/bit_field.h" #include "common/bit_field.h"
#include "core/mem_map.h" #include "core/mem_map.h"
#include "core/hle/hle.h"
#include "core/hle/kernel/event.h" #include "core/hle/kernel/event.h"
#include "core/hle/kernel/shared_memory.h" #include "core/hle/kernel/shared_memory.h"
#include "core/hle/service/gsp.h" #include "core/hle/service/gsp.h"

View file

@ -2,8 +2,6 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/log.h"
#include "core/hle/hle.h" #include "core/hle/hle.h"
#include "core/hle/service/ndm.h" #include "core/hle/service/ndm.h"

View file

@ -3,11 +3,8 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/common.h" #include "common/common.h"
#include "common/log.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "core/hle/hle.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/hle/service/apt.h" #include "core/hle/service/apt.h"
#include "core/hle/service/fs.h" #include "core/hle/service/fs.h"
@ -16,8 +13,6 @@
#include "core/hle/service/ndm.h" #include "core/hle/service/ndm.h"
#include "core/hle/service/srv.h" #include "core/hle/service/srv.h"
#include "core/hle/kernel/kernel.h"
namespace Service { namespace Service {
Manager* g_manager = nullptr; ///< Service manager Manager* g_manager = nullptr; ///< Service manager

View file

@ -4,7 +4,6 @@
#include "core/hle/hle.h" #include "core/hle/hle.h"
#include "core/hle/service/srv.h" #include "core/hle/service/srv.h"
#include "core/hle/service/service.h"
#include "core/hle/kernel/event.h" #include "core/hle/kernel/event.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

View file

@ -3,7 +3,6 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <map> #include <map>
#include <string>
#include "common/string_util.h" #include "common/string_util.h"
#include "common/symbols.h" #include "common/symbols.h"
@ -12,13 +11,11 @@
#include "core/hle/kernel/address_arbiter.h" #include "core/hle/kernel/address_arbiter.h"
#include "core/hle/kernel/event.h" #include "core/hle/kernel/event.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/mutex.h" #include "core/hle/kernel/mutex.h"
#include "core/hle/kernel/shared_memory.h" #include "core/hle/kernel/shared_memory.h"
#include "core/hle/kernel/thread.h" #include "core/hle/kernel/thread.h"
#include "core/hle/function_wrappers.h" #include "core/hle/function_wrappers.h"
#include "core/hle/svc.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

View file

@ -3,13 +3,11 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/common_types.h" #include "common/common_types.h"
#include "common/log.h"
#include "core/core.h" #include "core/core.h"
#include "core/mem_map.h" #include "core/mem_map.h"
#include "core/hle/hle.h" #include "core/hle/hle.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/service/gsp.h" #include "core/hle/service/gsp.h"
#include "core/hw/gpu.h" #include "core/hw/gpu.h"

View file

@ -3,7 +3,6 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/common_types.h" #include "common/common_types.h"
#include "common/log.h"
#include "core/hw/hw.h" #include "core/hw/hw.h"
#include "core/hw/gpu.h" #include "core/hw/gpu.h"

View file

@ -3,7 +3,6 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "common/common_types.h" #include "common/common_types.h"
#include "common/log.h"
#include "core/hw/ndma.h" #include "core/hw/ndma.h"

View file

@ -5,7 +5,6 @@
#include <memory> #include <memory>
#include "core/file_sys/archive_romfs.h" #include "core/file_sys/archive_romfs.h"
#include "core/loader/loader.h"
#include "core/loader/elf.h" #include "core/loader/elf.h"
#include "core/loader/ncch.h" #include "core/loader/ncch.h"
#include "core/hle/kernel/archive.h" #include "core/hle/kernel/archive.h"

View file

@ -6,7 +6,6 @@
#include "common/mem_arena.h" #include "common/mem_arena.h"
#include "core/mem_map.h" #include "core/mem_map.h"
#include "core/core.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

View file

@ -8,7 +8,6 @@
#include "core/mem_map.h" #include "core/mem_map.h"
#include "core/hw/hw.h" #include "core/hw/hw.h"
#include "hle/hle.h"
#include "hle/config_mem.h" #include "hle/config_mem.h"
namespace Memory { namespace Memory {