[Bf-blender-cvs] [fb4b7aaa8f2] temp-ui-cpp: Attempt to resolve build error

[Hans Goudey]

Commit: fb4b7aaa8f235c478431b661ce7c6a8e088ab73a
Author: Hans Goudey
Date:   Fri Nov 26 08:07:50 2021 -0500
Branches: temp-ui-cpp
https://developer.blender.org/rBfb4b7aaa8f235c478431b661ce7c6a8e088ab73a

Attempt to resolve build error

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

M	source/blender/editors/space_outliner/outliner_tools.cc
M	source/blender/windowmanager/message_bus/wm_message_bus.h

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

diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc
index 8acf877b81f..9484cbccd13 100644
--- a/source/blender/editors/space_outliner/outliner_tools.cc
+++ b/source/blender/editors/space_outliner/outliner_tools.cc
@@ -91,6 +91,7 @@
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
+#include "RNA_types.h"
 
 #include "SEQ_relations.h"
 #include "SEQ_sequencer.h"
diff --git a/source/blender/windowmanager/message_bus/wm_message_bus.h b/source/blender/windowmanager/message_bus/wm_message_bus.h
index 7ae356cf806..809c47286d0 100644
--- a/source/blender/windowmanager/message_bus/wm_message_bus.h
+++ b/source/blender/windowmanager/message_bus/wm_message_bus.h
@@ -234,17 +234,33 @@ void WM_msg_subscribe_ID(struct wmMsgBus *mbus,
                          const char *id_repr);
 void WM_msg_publish_ID(struct wmMsgBus *mbus, struct ID *id);
 
-#define WM_msg_publish_rna_prop(mbus, id_, data_, type_, prop_) \
-  { \
-    wmMsgParams_RNA msg_key_params_ = {{0}}; \
-    _WM_MESSAGE_EXTERN_BEGIN; \
-    extern PropertyRNA rna_##type_##_##prop_; \
-    _WM_MESSAGE_EXTERN_END; \
-    RNA_pointer_create(id_, &RNA_##type_, data_, &msg_key_params_.ptr); \
-    msg_key_params_.prop = &rna_##type_##_##prop_; \
-    WM_msg_publish_rna_params(mbus, &msg_key_params_); \
-  } \
-  ((void)0)
+#ifdef __cplusplus
+#  define WM_msg_publish_rna_prop(mbus, id_, data_, type_, prop_) \
+    { \
+      wmMsgParams_RNA msg_key_params_ = {{0}}; \
+      _WM_MESSAGE_EXTERN_BEGIN; \
+      extern "C" { \
+      PropertyRNA rna_##type_##_##prop_; \
+      } \
+      _WM_MESSAGE_EXTERN_END; \
+      RNA_pointer_create(id_, &RNA_##type_, data_, &msg_key_params_.ptr); \
+      msg_key_params_.prop = &rna_##type_##_##prop_; \
+      WM_msg_publish_rna_params(mbus, &msg_key_params_); \
+    } \
+    ((void)0)
+#else
+#  define WM_msg_publish_rna_prop(mbus, id_, data_, type_, prop_) \
+    { \
+      wmMsgParams_RNA msg_key_params_ = {{0}}; \
+      _WM_MESSAGE_EXTERN_BEGIN; \
+      extern PropertyRNA rna_##type_##_##prop_; \
+      _WM_MESSAGE_EXTERN_END; \
+      RNA_pointer_create(id_, &RNA_##type_, data_, &msg_key_params_.ptr); \
+      msg_key_params_.prop = &rna_##type_##_##prop_; \
+      WM_msg_publish_rna_params(mbus, &msg_key_params_); \
+    } \
+    ((void)0)
+#endif
 #define WM_msg_subscribe_rna_prop(mbus, id_, data_, type_, prop_, value) \
   { \
     wmMsgParams_RNA msg_key_params_ = {{0}}; \