[Bf-blender-cvs] [25c99e72cda] master: Fix linking in debug mode

Campbell Barton noreply at git.blender.org
Sat Jan 22 08:01:03 CET 2022


Commit: 25c99e72cdac0545ab5e2005b56a556313612758
Author: Campbell Barton
Date:   Sat Jan 22 17:59:09 2022 +1100
Branches: master
https://developer.blender.org/rB25c99e72cdac0545ab5e2005b56a556313612758

Fix linking in debug mode

b7878a4d457a59d4a42f8ac0f428ea336562d75a seems to have caused linking
issues building debug mode on Linux.

Using extern "C" resolves.

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

M	source/blender/bmesh/intern/bmesh_private.h

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

diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h
index 977142578ca..4b3c4cbff82 100644
--- a/source/blender/bmesh/intern/bmesh_private.h
+++ b/source/blender/bmesh/intern/bmesh_private.h
@@ -27,6 +27,10 @@
  * parts of the bmesh internals.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* returns positive nonzero on error */
 
 #ifdef NDEBUG
@@ -102,3 +106,7 @@ void poly_rotate_plane(const float normal[3], float (*verts)[3], uint nverts);
 
 /* include the rest of our private declarations */
 #include "bmesh_structure.h"
+
+#ifdef __cplusplus
+}
+#endif



More information about the Bf-blender-cvs mailing list