From b35a3933eee7b8f1977ccd711c1ecd862bf618e5 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Mon, 1 Mar 2021 16:24:07 +0100 Subject: Build-system: Use C-linkage for internal interface header That way the header can be included in C++ files. --- source/blender/editors/interface/interface_intern.h | 8 ++++++++ source/tools | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 3da66d45abd..7e931eae749 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -31,6 +31,10 @@ #include "UI_interface.h" #include "UI_resources.h" +#ifdef __cplusplus +extern "C" { +#endif + struct ARegion; struct AnimationEvalContext; struct CurveMapping; @@ -1200,3 +1204,7 @@ bool ui_jump_to_target_button_poll(struct bContext *C); /* interface_queries.c */ void ui_interface_tag_script_reload_queries(void); + +#ifdef __cplusplus +} +#endif diff --git a/source/tools b/source/tools index 42a86b05869..dc4ccc3bfb6 160000 --- a/source/tools +++ b/source/tools @@ -1 +1 @@ -Subproject commit 42a86b05869c464c87185be378e668b4a9abec8b +Subproject commit dc4ccc3bfb646ef2a558bd3565f84080e99b0e8b -- cgit v1.2.3