Commit: 5efd2b7f36fbe2444e77d2b7b275d793da997c84
Author: Campbell Barton
Date: Tue Nov 18 10:55:46 2014 +0100
Branches: master
https://developer.blender.org/rB5efd2b7f36fbe2444e77d2b7b275d793da997c84
correct another problem with BLI_assert
need to use extern C for C++
===================================================================
M source/blender/blenlib/BLI_utildefines.h
===================================================================
diff --git a/source/blender/blenlib/BLI_utildefines.h
b/source/blender/blenlib/BLI_utildefines.h
index a6dee7f..9a8877e 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -32,6 +32,10 @@
* \ingroup bli
*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* avoid many includes for now */
#include "BLI_sys_types.h"
#include "BLI_compiler_compat.h"
@@ -560,4 +564,8 @@ extern void BLI_system_backtrace(FILE *fp);
# define UNLIKELY(x) (x)
#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __BLI_UTILDEFINES_H__ */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
