aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/common/memory_util.cpp
diff options
context:
space:
mode:
authorGravatar Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-06-21 13:12:49 +0100
committerGravatar Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-06-28 00:36:54 +0100
commit2d044a67c932403b81fdde6f81d461c6e7c11efe (patch)
tree84e423036be6e126d39ad18b02662f6ea6677ea1 /src/common/memory_util.cpp
parent3a771a13dcfd1de061e886e081393fca1fd1e689 (diff)
Common: Cleanup memory and misc includes.
Diffstat (limited to 'src/common/memory_util.cpp')
-rw-r--r--src/common/memory_util.cpp11
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)