[Bf-blender-cvs] [256d36683b7] master: Cleanup: remove redundant 'extern StructRNA' declarations

Germano Cavalcante noreply at git.blender.org
Tue Mar 15 13:15:11 CET 2022


Commit: 256d36683b755fbf4c3e4a80e3935888643719ea
Author: Germano Cavalcante
Date:   Mon Mar 14 16:38:42 2022 -0300
Branches: master
https://developer.blender.org/rB256d36683b755fbf4c3e4a80e3935888643719ea

Cleanup: remove redundant 'extern StructRNA' declarations

After rB9b298cf3dbec, the `StructRNA` declarations can now be accessed via
`RNA prototypes.h`

Also, since all redundated declarations are now removed,
`_WM_MESSAGE_EXTERN_BEGIN` and `_WM_MESSAGE_EXTERN_END` are also no
longer needed.

Differential Revision: https://developer.blender.org/D14342

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

M	source/blender/editors/transform/transform.c
M	source/blender/windowmanager/message_bus/wm_message_bus.h

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 92d312cebce..975f4370425 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1519,12 +1519,6 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
         wmMsgParams_RNA msg_key_params = {{0}};
         RNA_pointer_create(&t->scene->id, &RNA_ToolSettings, ts, &msg_key_params.ptr);
 
-        _WM_MESSAGE_EXTERN_BEGIN;
-        extern PropertyRNA rna_ToolSettings_use_snap;
-        extern PropertyRNA rna_ToolSettings_use_snap_node;
-        extern PropertyRNA rna_ToolSettings_use_snap_sequencer;
-        extern PropertyRNA rna_ToolSettings_use_snap_uv;
-        _WM_MESSAGE_EXTERN_END;
         if (t->spacetype == SPACE_NODE) {
           snap_flag_ptr = &ts->snap_flag_node;
           msg_key_params.prop = &rna_ToolSettings_use_snap_node;
diff --git a/source/blender/windowmanager/message_bus/wm_message_bus.h b/source/blender/windowmanager/message_bus/wm_message_bus.h
index ccb9b92349a..1bc983f20ad 100644
--- a/source/blender/windowmanager/message_bus/wm_message_bus.h
+++ b/source/blender/windowmanager/message_bus/wm_message_bus.h
@@ -195,16 +195,6 @@ typedef struct wmMsgSubscribeKey_RNA {
   wmMsg_RNA msg;
 } wmMsgSubscribeKey_RNA;
 
-#ifdef __GNUC__
-#  define _WM_MESSAGE_EXTERN_BEGIN \
-    _Pragma("GCC diagnostic push"); \
-    _Pragma("GCC diagnostic ignored \"-Wredundant-decls\"");
-#  define _WM_MESSAGE_EXTERN_END _Pragma("GCC diagnostic pop");
-#else
-#  define _WM_MESSAGE_EXTERN_BEGIN
-#  define _WM_MESSAGE_EXTERN_END
-#endif
-
 void WM_msgtypeinfo_init_rna(wmMsgTypeInfo *msgtype_info);
 
 wmMsgSubscribeKey_RNA *WM_msg_lookup_rna(struct wmMsgBus *mbus,



More information about the Bf-blender-cvs mailing list