Remove circular include between core/typedefs.h and core/error_macros.h

core/cowdata.h

@@ -33,6 +33,7 @@
 
 #include <string.h>
 
+#include "core/error_macros.h"
 #include "core/os/memory.h"
 #include "core/safe_refcount.h"
 

core/list.h

@@ -31,6 +31,7 @@
 #ifndef GLOBALS_LIST_H
 #define GLOBALS_LIST_H
 
+#include "core/error_macros.h"
 #include "core/os/memory.h"
 #include "core/sort_array.h"
 

core/map.h

@@ -31,6 +31,7 @@
 #ifndef MAP_H
 #define MAP_H
 
+#include "core/error_macros.h"
 #include "core/set.h"
 
 // based on the very nice implementation of rb-trees by:

core/math/math_funcs.cpp

@@ -30,6 +30,8 @@
 
 #include "math_funcs.h"
 
+#include "core/error_macros.h"
+
 RandomPCG Math::default_rand(RandomPCG::DEFAULT_SEED, RandomPCG::DEFAULT_INC);
 
 #define PHI 0x9e3779b9

core/os/memory.h

@@ -31,6 +31,7 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
+#include "core/error_macros.h"
 #include "core/safe_refcount.h"
 
 #include <stddef.h>

core/self_list.h

@@ -31,6 +31,7 @@
 #ifndef SELF_LIST_H
 #define SELF_LIST_H
 
+#include "core/error_macros.h"
 #include "core/typedefs.h"
 
 template <class T>

core/sort_array.h

@@ -31,6 +31,7 @@
 #ifndef SORT_ARRAY_H
 #define SORT_ARRAY_H
 
+#include "core/error_macros.h"
 #include "core/typedefs.h"
 
 #define ERR_BAD_COMPARE(cond)                                         \

core/typedefs.h

@@ -108,7 +108,6 @@ T *_nullptr() {
 #include "core/int_types.h"
 
 #include "core/error_list.h"
-#include "core/error_macros.h"
 
 /** Generic ABS function, for math uses please use Math::abs */