Cleanup: use BLI_compiler_compat.h for BLI_INLINE

diff --git a/source/blender/blenkernel/BKE_ccg.h b/source/blender/blenkernel/BKE_ccg.h
index 65d4688947e6e765e460fa40e315ff79a563a8c1..4d0f6d538205a7e423e32156e0ed6ff090ff7421 100644 (file)
--- a/source/blender/blenkernel/BKE_ccg.h
+++ b/source/blender/blenkernel/BKE_ccg.h
@@ -33,7 +33,7 @@
  */
 
 /* defines BLI_INLINE */
-#include "BLI_utildefines.h"
+#include "BLI_compiler_compat.h"
 
 /* declares fprintf() and abort(), needed for BLI_assert */
 #include <stdio.h>

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 23ef45416f7ea0a0be5ecdf55f1599c2a748badc..09860972802f778ea9bdda648082164de3bb7795 100644 (file)
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -32,7 +32,7 @@
  *  \ingroup bke
  */
 
-#include "BLI_utildefines.h"
+#include "BLI_compiler_compat.h"
 #include "BLI_ghash.h"
 
 #include "DNA_listBase.h"

diff --git a/source/blender/blenlib/BLI_rect.h b/source/blender/blenlib/BLI_rect.h
index a6670266643b795cd67775b833475380905795d3..221d328dd9e6c518d6c46a3135977278791c63dd 100644 (file)
--- a/source/blender/blenlib/BLI_rect.h
+++ b/source/blender/blenlib/BLI_rect.h
@@ -34,7 +34,8 @@
  */
 
 #include "DNA_vec_types.h"
-#include "BLI_utildefines.h"
+#include "BLI_sys_types.h"  /* bool */
+#include "BLI_compiler_compat.h"
 
 struct rctf;
 struct rcti;

diff --git a/source/blender/blenlib/intern/rand.c b/source/blender/blenlib/intern/rand.c
index 110757ac3c0f2572bb1e13471d8550d0d64ec96f..23905be4ced23d39189a5d147bd14d9fadc5f5df 100644 (file)
--- a/source/blender/blenlib/intern/rand.c
+++ b/source/blender/blenlib/intern/rand.c
@@ -42,7 +42,7 @@
 #include "BLI_math.h"
 
 /* defines BLI_INLINE */
-#include "BLI_utildefines.h"
+#include "BLI_compiler_compat.h"
 
 #include "BLI_sys_types.h"
 #include "BLI_strict_flags.h"

diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c
index e0d92e8a19f2a7884c34fc4ed2dcfe7b8356b01a..5b1e378a2dadc706fb29049e2c65424f9b3bba79 100644 (file)
--- a/source/blender/blenlib/intern/rct.c
+++ b/source/blender/blenlib/intern/rct.c
@@ -39,8 +39,10 @@
 #include <limits.h>
 #include <float.h>
 
-#include "DNA_vec_types.h"
 #include "BLI_rect.h"
+#include "BLI_utildefines.h"
+
+#include "DNA_vec_types.h"
 
 /* avoid including BLI_math */
 static void unit_m4(float m[4][4]);