From 256d36683b755fbf4c3e4a80e3935888643719ea Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Mon, 14 Mar 2022 16:38:42 -0300 Subject: [PATCH] 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 --- source/blender/editors/transform/transform.c | 6 ------ .../blender/windowmanager/message_bus/wm_message_bus.h | 10 ---------- 2 files changed, 16 deletions(-) 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,