From 2ea78fb28f5f90c736b6d048b5e1f1d787c48920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Thu, 20 Mar 2014 10:08:19 +0100 Subject: Fix for clang build warnings: ATTR_WARN_UNUSED_RESULT is used after the inline definitions are included, which gives lots of warnings "attribute declaration must precede definition". See also rB83617429cf28f2a19e991a0f71d892fc159a4419 --- source/blender/blenlib/BLI_math_geom.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source/blender/blenlib/BLI_math_geom.h') diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index 8b5190b9672..633887e3ef8 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -37,10 +37,6 @@ extern "C" { #include "BLI_compiler_attrs.h" #include "BLI_math_inline.h" -#if BLI_MATH_DO_INLINE -#include "intern/math_geom_inline.c" -#endif - #ifdef BLI_MATH_GCC_WARN_PRAGMA # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wredundant-decls" @@ -314,6 +310,12 @@ MINLINE int min_axis_v3(const float vec[3]); MINLINE int poly_to_tri_count(const int poly_count, const int corner_count); +/**************************** Inline Definitions ******************************/ + +#if BLI_MATH_DO_INLINE +#include "intern/math_geom_inline.c" +#endif + #ifdef BLI_MATH_GCC_WARN_PRAGMA # pragma GCC diagnostic pop #endif -- cgit v1.2.3