Cleanup

src/core/guid.cpp

@@ -5,7 +5,6 @@
 
 #include "dynamic_string.h"
 #include "guid.h"
-#include "macros.h"
 #include "platform.h"
 
 #if CROWN_PLATFORM_POSIX

src/core/json/json.cpp

@@ -5,7 +5,6 @@
 
 #include "dynamic_string.h"
 #include "json.h"
-#include "macros.h"
 #include "map.h"
 #include "string_utils.h"
 #include "temp_allocator.h"

src/core/json/sjson.cpp

@@ -4,7 +4,6 @@
  */
 
 #include "dynamic_string.h"
-#include "macros.h"
 #include "map.h"
 #include "quaternion.h"
 #include "sjson.h"

src/core/macros.h

@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2012-2016 Daniele Bartolini and individual contributors.
- * License: https://github.com/taylor001/crown/blob/master/LICENSE
- */
-
-#pragma once
-
-#include "platform.h"
-
-#if CROWN_COMPILER_GCC
-	#define CE_EXPORT __attribute__ ((visibility("default")))
-	#define CE_INLINE inline
-	#define CE_THREAD __thread
-#elif CROWN_COMPILER_MSVC
-	#define CE_EXPORT __declspec(dllexport)
-	#define CE_INLINE __inline
-	#define CE_THREAD __declspec(thread)
-#else
-	#error "Compiler not supported"
-#endif
-
-#define CE_UNUSED(x) do { (void)(x); } while (0)
-#define CE_CONCATENATE1(a, b) a ## b
-#define CE_CONCATENATE(a, b) CE_CONCATENATE1(a, b)
-#define CE_STATIC_ASSERT(condition) typedef int CE_CONCATENATE(STATIC_ASSERT,__LINE__)[condition ? 1 : -1]

src/core/network/socket.h

@@ -7,7 +7,6 @@
 
 #include "error.h"
 #include "ip_address.h"
-#include "macros.h"
 #include "platform.h"
 #include "types.h"
 

src/core/os.h

@@ -6,7 +6,6 @@
 #pragma once
 
 #include "error.h"
-#include "macros.h"
 #include "platform.h"
 #include "string_types.h"
 #include "types.h"

src/core/thread/mutex.h

@@ -6,7 +6,6 @@
 #pragma once
 
 #include "error.h"
-#include "macros.h"
 #include "platform.h"
 #include "types.h"
 

src/core/types.h

@@ -40,3 +40,16 @@ typedef double   f64;
 #endif
 
 #define countof(arr) (sizeof(arr)/sizeof(arr[0]))
+
+#define CE_UNUSED(x) do { (void)(x); } while (0)
+#define CE_CONCATENATE1(a, b) a ## b
+#define CE_CONCATENATE(a, b) CE_CONCATENATE1(a, b)
+#define CE_STATIC_ASSERT(condition) typedef int CE_CONCATENATE(STATIC_ASSERT,__LINE__)[condition ? 1 : -1]
+
+#if defined(__GNUC__)
+	#define CE_THREAD __thread
+#elif defined(_MSC_VER)
+	#define CE_THREAD __declspec(thread)
+#else
+	#error "Compiler not supported"
+#endif

src/device/input_manager.cpp

@@ -5,7 +5,6 @@
 
 #include "input_device.h"
 #include "input_manager.h"
-#include "macros.h"
 #include "memory.h"
 
 namespace crown

src/resource/physics_resource.cpp

@@ -7,7 +7,6 @@
 #include "compile_options.h"
 #include "dynamic_string.h"
 #include "filesystem.h"
-#include "macros.h"
 #include "map.h"
 #include "physics_resource.h"
 #include "quaternion.h"

src/resource/unit_compiler.cpp

@@ -5,7 +5,6 @@
 
 #include "array.h"
 #include "compile_options.h"
-#include "macros.h"
 #include "map.h"
 #include "math_utils.h"
 #include "physics_resource.h"