aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/common
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
parent3a771a13dcfd1de061e886e081393fca1fd1e689 (diff)
Common: Cleanup memory and misc includes.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/common_funcs.h4
-rw-r--r--src/common/common_types.h2
-rw-r--r--src/common/logging/log.h4
-rw-r--r--src/common/memory_util.cpp11
-rw-r--r--src/common/memory_util.h4
-rw-r--r--src/common/misc.cpp5
-rw-r--r--src/common/swap.h10
7 files changed, 18 insertions, 22 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 91b74c6b..cc74a228 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -5,8 +5,6 @@
#pragma once
#include "common_types.h"
-#include <cstdlib>
-
#define b2(x) ( (x) | ( (x) >> 1) )
#define b4(x) ( b2(x) | ( b2(x) >> 2) )
@@ -43,8 +41,6 @@
#ifndef _MSC_VER
-#include <errno.h>
-
#if defined(__x86_64__) || defined(_M_X64)
#define Crash() __asm__ __volatile__("int $3")
#elif defined(_M_ARM)
diff --git a/src/common/common_types.h b/src/common/common_types.h
index f6de0adf..ebfd7824 100644
--- a/src/common/common_types.h
+++ b/src/common/common_types.h
@@ -24,9 +24,7 @@
#pragma once
-#include <cmath>
#include <cstdint>
-#include <cstdlib>
#ifdef _MSC_VER
#ifndef __func__
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index 5b3a731e..e16dde7f 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -4,10 +4,6 @@
#pragma once
-#include <cassert>
-#include <chrono>
-#include <string>
-
#include "common/common_types.h"
namespace Log {
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)
diff --git a/src/common/memory_util.h b/src/common/memory_util.h
index 9fdbf1f1..9bf37c44 100644
--- a/src/common/memory_util.h
+++ b/src/common/memory_util.h
@@ -4,9 +4,7 @@
#pragma once
-#ifndef _WIN32
-#include <sys/mman.h>
-#endif
+#include <cstddef>
#include <string>
void* AllocateExecutableMemory(size_t size, bool low = true);
diff --git a/src/common/misc.cpp b/src/common/misc.cpp
index 53cacf37..d2a049b6 100644
--- a/src/common/misc.cpp
+++ b/src/common/misc.cpp
@@ -2,12 +2,13 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "common/common_funcs.h"
+#include <cstddef>
#ifdef _WIN32
#include <windows.h>
#else
-#include <string.h>
+#include <cerrno>
+#include <cstring>
#endif
// Neither Android nor OS X support TLS
diff --git a/src/common/swap.h b/src/common/swap.h
index 588cebc7..b92e5bfa 100644
--- a/src/common/swap.h
+++ b/src/common/swap.h
@@ -17,12 +17,16 @@
#pragma once
-#if defined(__linux__)
-#include <byteswap.h>
+#if defined(_MSC_VER)
+ #include <cstdlib>
+#elif defined(__linux__)
+ #include <byteswap.h>
#elif defined(__FreeBSD__)
-#include <sys/endian.h>
+ #include <sys/endian.h>
#endif
+#include "common/common_types.h"
+
// GCC 4.6+
#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)