diff options
| author |  Yuri Kunde Schlesner | 2015-07-10 16:36:12 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-07-10 16:36:12 -0700 |
| commit | 867c28ae03b3b2883713896765f3ff76eaf90a19 (patch) | |
| tree | 8ff8cf3ab24d2f167c19217efb8175a8841c0359 /src/common/memory_util.cpp | |
| parent | Merge pull request #906 from aroulin/loader-format-specifier-warning (diff) | |
| parent | Core: Cleanup hw includes. (diff) | |
| download | yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.gz yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.xz yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.zip | |
Merge pull request #876 from linkmauve/include-cleanups
Cleanup includes, mostly in common
Diffstat (limited to '')
| -rw-r--r-- | src/common/memory_util.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index 20b791a10..2b3ace528 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp | |||
| @@ -3,14 +3,17 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | #include "common/common_funcs.h" | ||
| 7 | #include "common/logging/log.h" | 6 | #include "common/logging/log.h" |
| 8 | #include "common/memory_util.h" | 7 | #include "common/memory_util.h" |
| 9 | #include "common/string_util.h" | ||
| 10 | 8 | ||
| 11 | #ifdef _WIN32 | 9 | #ifdef _WIN32 |
| 12 | #include <windows.h> | 10 | #include <windows.h> |
| 13 | #include <psapi.h> | 11 | #include <psapi.h> |
| 12 | #include "common/common_funcs.h" | ||
| 13 | #include "common/string_util.h" | ||
| 14 | #else | ||
| 15 | #include <cstdlib> | ||
| 16 | #include <sys/mman.h> | ||
| 14 | #endif | 17 | #endif |
| 15 | 18 | ||
| 16 | #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) | 19 | #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) |