diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-10 16:36:12 -0700 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-10 16:36:12 -0700 |
commit | 867c28ae03b3b2883713896765f3ff76eaf90a19 (patch) | |
tree | 8ff8cf3ab24d2f167c19217efb8175a8841c0359 /src/core/loader | |
parent | ac7bc214abe6b8f9eb2c122709ea99a0ca4b4245 (diff) | |
parent | 4964a359e1a82f87a9772140fd1d933c5812c2e7 (diff) |
Merge pull request #876 from linkmauve/include-cleanups
Cleanup includes, mostly in common
Diffstat (limited to 'src/core/loader')
-rw-r--r-- | src/core/loader/elf.cpp | 3 | ||||
-rw-r--r-- | src/core/loader/loader.cpp | 2 | ||||
-rw-r--r-- | src/core/loader/loader.h | 8 | ||||
-rw-r--r-- | src/core/loader/ncch.cpp | 3 |
4 files changed, 13 insertions, 3 deletions
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp index f00753a7..a7eea78a 100644 --- a/src/core/loader/elf.cpp +++ b/src/core/loader/elf.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <cstring> #include <string> #include <memory> @@ -10,7 +11,7 @@ #include "common/logging/log.h" #include "common/symbols.h" -#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/process.h" #include "core/hle/kernel/resource_limit.h" #include "core/loader/elf.h" #include "core/memory.h" diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 8b14edf0..2e450fce 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -2,10 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <memory> #include <string> #include "common/logging/log.h" #include "common/make_unique.h" +#include "common/string_util.h" #include "core/file_sys/archive_romfs.h" #include "core/hle/kernel/process.h" diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 87e16fb9..52bbf35b 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -4,12 +4,18 @@ #pragma once +#include <algorithm> +#include <initializer_list> +#include <memory> +#include <string> #include <vector> #include "common/common_types.h" #include "common/file_util.h" -#include "core/hle/kernel/process.h" +namespace Kernel { +struct AddressMapping; +} //////////////////////////////////////////////////////////////////////////////////////////////////// // Loader namespace diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 6a9d866a..2b26b31c 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include <algorithm> +#include <cstring> #include <memory> #include "common/logging/log.h" @@ -10,7 +11,7 @@ #include "common/string_util.h" #include "common/swap.h" -#include "core/hle/kernel/kernel.h" +#include "core/hle/kernel/process.h" #include "core/hle/kernel/resource_limit.h" #include "core/loader/ncch.h" #include "core/memory.h" |