diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 04:17:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 04:17:58 +0300 |
| commit | dca3d3ef0ef0be81de8b880ad70bc66856e8a401 (patch) | |
| tree | 7f2b318a9d402e312aae3932a606cf7f9ab3a29f /source/blender | |
| parent | 59e70d5f8d68d8fa9eb34f75866578fafece8709 (diff) | |
Cleanup: use BLI_compiler_compat.h for BLI_INLINE
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/BKE_ccg.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_node.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_rect.h | 3 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/rand.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/rct.c | 4 |
5 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_ccg.h b/source/blender/blenkernel/BKE_ccg.h index 65d4688947e..4d0f6d53820 100644 --- 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 23ef45416f7..09860972802 100644 --- 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 a6670266643..221d328dd9e 100644 --- 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 110757ac3c0..23905be4ced 100644 --- 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 e0d92e8a19f..5b1e378a2da 100644 --- 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]); |