aboutsummaryrefslogtreecommitdiff
path: root/src/common/common_types.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-12 23:20:01 -0500
committerbunnei <bunneidev@gmail.com>2014-12-12 23:20:01 -0500
commitaf1cd769e7b407af71496e788e218add31f8b2b0 (patch)
tree1e3fd71256c04a15970b09abd3f7280f8b1ff678 /src/common/common_types.h
parenta6791e4fc73dda4853c8363d8ecf5094dbedd0ab (diff)
parent4d2a6f8b9b3eeb85574a5e4f93422ffd4feebcd3 (diff)
Merge pull request #258 from yuriks/log-ng
New logging system
Diffstat (limited to 'src/common/common_types.h')
-rw-r--r--src/common/common_types.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/common/common_types.h b/src/common/common_types.h
index fcc8b9a4e..c74c74f0f 100644
--- a/src/common/common_types.h
+++ b/src/common/common_types.h
@@ -41,8 +41,6 @@ typedef std::int64_t s64; ///< 64-bit signed int
typedef float f32; ///< 32-bit floating point
typedef double f64; ///< 64-bit floating point
-#include "common/common.h"
-
/// Union for fast 16-bit type casting
union t16 {
u8 _u8[2]; ///< 8-bit unsigned char(s)