diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-05-08 19:16:39 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-05-08 19:22:41 +0300 |
| commit | 6f985574b775882075f48f59835bc5a42b1374dd (patch) | |
| tree | b68afdd1a5ef313ef13ad7d7ed46b6f6f92e8000 /source/blender/blenlib/BLI_math_geom.h | |
| parent | 0d0dcfd64343930ba66e70c400cbd66f20a85b4f (diff) | |
Cleanup: take includes out of 'extern "C"' blocks
Surrounding includes with an 'extern "C"' block is not necessary anymore.
Also that made it harder to add any C++ code to some headers, or include headers
that have "optional" C++ code like `MEM_guardedalloc.h`.
I tested compilation on linux and windows (and got help from @LazyDodo).
If this still breaks compilation due to some linker error, the header containing
the symbol in question is probably missing an 'extern "C"' block.
Differential Revision: https://developer.blender.org/D7653
Diffstat (limited to 'source/blender/blenlib/BLI_math_geom.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_geom.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index 2049f368578..563bcad5d14 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -27,10 +27,6 @@ * \ingroup bli */ -#ifdef __cplusplus -extern "C" { -#endif - #include "BLI_compiler_attrs.h" #include "BLI_math_inline.h" @@ -39,6 +35,10 @@ extern "C" { # pragma GCC diagnostic ignored "-Wredundant-decls" #endif +#ifdef __cplusplus +extern "C" { +#endif + /********************************** Polygons *********************************/ float normal_tri_v3(float r[3], const float a[3], const float b[3], const float c[3]); |