[Bf-blender-cvs] [d4ce777aedc] master: BLI: move inline include to the bottom to avoid redeclaration warning

Jacques Lucke noreply at git.blender.org
Thu Jul 16 11:33:43 CEST 2020


Commit: d4ce777aedcf041f8f51b971ca52e02afa361e0f
Author: Jacques Lucke
Date:   Thu Jul 16 11:33:35 2020 +0200
Branches: master
https://developer.blender.org/rBd4ce777aedcf041f8f51b971ca52e02afa361e0f

BLI: move inline include to the bottom to avoid redeclaration warning

===================================================================

M	source/blender/blenlib/BLI_math_base_safe.h

===================================================================

diff --git a/source/blender/blenlib/BLI_math_base_safe.h b/source/blender/blenlib/BLI_math_base_safe.h
index 42980c3f532..88a08c3cbc7 100644
--- a/source/blender/blenlib/BLI_math_base_safe.h
+++ b/source/blender/blenlib/BLI_math_base_safe.h
@@ -26,10 +26,6 @@
 
 #include "BLI_math_base.h"
 
-#if BLI_MATH_DO_INLINE
-#  include "intern/math_base_safe_inline.c"
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -47,4 +43,8 @@ MINLINE float safe_powf(float base, float exponent);
 }
 #endif
 
+#if BLI_MATH_DO_INLINE
+#  include "intern/math_base_safe_inline.c"
+#endif
+
 #endif /* __BLI_MATH_BASE_SAFE_H__ */



More information about the Bf-blender-cvs mailing list