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/common/memory_util.cpp | |
| parent | ac7bc214abe6b8f9eb2c122709ea99a0ca4b4245 (diff) | |
| parent | 4964a359e1a82f87a9772140fd1d933c5812c2e7 (diff) | |
Merge pull request #876 from linkmauve/include-cleanups
Cleanup includes, mostly in common
Diffstat (limited to 'src/common/memory_util.cpp')
| -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 20b791a1..2b3ace52 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp @@ -3,14 +3,17 @@ // Refer to the license.txt file included. -#include "common/common_funcs.h" #include "common/logging/log.h" #include "common/memory_util.h" -#include "common/string_util.h" #ifdef _WIN32 -#include <windows.h> -#include <psapi.h> + #include <windows.h> + #include <psapi.h> + #include "common/common_funcs.h" + #include "common/string_util.h" +#else + #include <cstdlib> + #include <sys/mman.h> #endif #if !defined(_WIN32) && defined(__x86_64__) && !defined(MAP_32BIT) |