diff options
author | Jacques Lucke <jacques@blender.org> | 2020-07-28 17:32:30 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-07-28 17:33:43 +0300 |
commit | b274d18aec525621bcb0a2234fc65e09398616c2 (patch) | |
tree | ec4310013623197f5bac2eb51c200503d898bd06 /source/blender/windowmanager | |
parent | 9c1da81a4c173437c1e556afde7b32eef4b0a47d (diff) |
Cleanup: correct usage of extern-C blocks in various places
This removes extern-C blocks around other includes and adds
such blocks for some headers that need them.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/gizmo/WM_gizmo_api.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/gizmo/WM_gizmo_types.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/gizmo/wm_gizmo_fn.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/message_bus/wm_message_bus.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/wm.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_cursors.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_draw.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_event_system.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_files.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_surface.h | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_window.h | 8 |
13 files changed, 104 insertions, 0 deletions
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h index 07a3f0445bb..1066f009214 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h @@ -52,6 +52,10 @@ struct wmWindowManager; #include "wm_gizmo_fn.h" +#ifdef __cplusplus +extern "C" { +#endif + /* -------------------------------------------------------------------- */ /* wmGizmo */ @@ -396,4 +400,8 @@ void WM_gizmo_group_tag_remove(struct wmGizmoGroup *gzgroup); bool WM_gizmo_group_type_poll(const struct bContext *C, const struct wmGizmoGroupType *gzgt); void WM_gizmo_group_refresh(const struct bContext *C, struct wmGizmoGroup *gzgroup); +#ifdef __cplusplus +} +#endif + #endif /* __WM_GIZMO_API_H__ */ diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_types.h b/source/blender/windowmanager/gizmo/WM_gizmo_types.h index 3863e3bd797..5def7f8d2f9 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_types.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.h @@ -40,6 +40,10 @@ struct wmKeyConfig; #include "DNA_listBase.h" +#ifdef __cplusplus +extern "C" { +#endif + /* -------------------------------------------------------------------- */ /* Enum Typedef's */ @@ -506,4 +510,8 @@ typedef enum eWM_GizmoFlagMapDrawStep { } eWM_GizmoFlagMapDrawStep; #define WM_GIZMOMAP_DRAWSTEP_MAX 2 +#ifdef __cplusplus +} +#endif + #endif /* __WM_GIZMO_TYPES_H__ */ diff --git a/source/blender/windowmanager/gizmo/wm_gizmo_fn.h b/source/blender/windowmanager/gizmo/wm_gizmo_fn.h index 58b58fa01d0..00a3f476bac 100644 --- a/source/blender/windowmanager/gizmo/wm_gizmo_fn.h +++ b/source/blender/windowmanager/gizmo/wm_gizmo_fn.h @@ -27,6 +27,10 @@ struct wmMsgBus; +#ifdef __cplusplus +extern "C" { +#endif + /* wmGizmoGroup */ typedef bool (*wmGizmoGroupFnPoll)(const struct bContext *, struct wmGizmoGroupType *) ATTR_WARN_UNUSED_RESULT; @@ -85,4 +89,8 @@ typedef struct wmGizmoPropertyFnParams { void *user_data; } wmGizmoPropertyFnParams; +#ifdef __cplusplus +} +#endif + #endif /* __WM_GIZMO_FN_H__ */ diff --git a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h index cc9ccc5f4bb..edded4c7620 100644 --- a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h +++ b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h @@ -36,6 +36,10 @@ struct wmEventHandler_Op; struct wmGizmoMap; struct wmOperatorType; +#ifdef __cplusplus +extern "C" { +#endif + /* -------------------------------------------------------------------- */ /* wmGizmo */ @@ -92,4 +96,8 @@ struct ListBase *wm_gizmomap_groups_get(wmGizmoMap *gzmap); void wm_gizmomaptypes_free(void); +#ifdef __cplusplus +} +#endif + #endif /* __WM_GIZMO_WMAPI_H__ */ diff --git a/source/blender/windowmanager/message_bus/wm_message_bus.h b/source/blender/windowmanager/message_bus/wm_message_bus.h index 8020be3017a..74472386a39 100644 --- a/source/blender/windowmanager/message_bus/wm_message_bus.h +++ b/source/blender/windowmanager/message_bus/wm_message_bus.h @@ -34,6 +34,10 @@ struct wmMsgSubscribeKey; struct wmMsgSubscribeValue; struct wmMsgSubscribeValueLink; +#ifdef __cplusplus +extern "C" { +#endif + typedef void (*wmMsgNotifyFn)(struct bContext *C, struct wmMsgSubscribeKey *msg_key, struct wmMsgSubscribeValue *msg_val); @@ -287,4 +291,8 @@ void WM_msg_publish_ID(struct wmMsgBus *mbus, struct ID *id); } \ ((void)0) +#ifdef __cplusplus +} +#endif + #endif /* __WM_MESSAGE_BUS_H__ */ diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h index 16aa5cb44db..2b59e047f23 100644 --- a/source/blender/windowmanager/wm.h +++ b/source/blender/windowmanager/wm.h @@ -30,6 +30,10 @@ struct wmWindow; #include "gizmo/wm_gizmo_wmapi.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct wmPaintCursor { struct wmPaintCursor *next, *prev; @@ -97,4 +101,8 @@ void wm_stereo3d_set_cancel(bContext *C, wmOperator *op); void wm_open_init_load_ui(wmOperator *op, bool use_prefs); void wm_open_init_use_scripts(wmOperator *op, bool use_prefs); +#ifdef __cplusplus +} +#endif + #endif diff --git a/source/blender/windowmanager/wm_cursors.h b/source/blender/windowmanager/wm_cursors.h index 7a28aeb3c70..cdd6b325063 100644 --- a/source/blender/windowmanager/wm_cursors.h +++ b/source/blender/windowmanager/wm_cursors.h @@ -27,6 +27,10 @@ struct wmEvent; struct wmWindow; +#ifdef __cplusplus +extern "C" { +#endif + typedef enum WMCursorType { WM_CURSOR_DEFAULT = 1, WM_CURSOR_TEXT_EDIT, @@ -77,4 +81,8 @@ typedef enum WMCursorType { void wm_init_cursor_data(void); bool wm_cursor_arrow_move(struct wmWindow *win, const struct wmEvent *event); +#ifdef __cplusplus +} +#endif + #endif /* __WM_CURSORS_H__ */ diff --git a/source/blender/windowmanager/wm_draw.h b/source/blender/windowmanager/wm_draw.h index ff2fc25333a..a675647f57a 100644 --- a/source/blender/windowmanager/wm_draw.h +++ b/source/blender/windowmanager/wm_draw.h @@ -30,6 +30,10 @@ struct GPUOffScreen; struct GPUTexture; struct GPUViewport; +#ifdef __cplusplus +extern "C" { +#endif + typedef struct wmDrawBuffer { struct GPUOffScreen *offscreen; struct GPUViewport *viewport; @@ -50,4 +54,8 @@ void wm_draw_region_test(struct bContext *C, struct ScrArea *area, struct ARegio struct GPUTexture *wm_draw_region_texture(struct ARegion *region, int view); +#ifdef __cplusplus +} +#endif + #endif /* __WM_DRAW_H__ */ diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h index efcf40d03eb..c61ba61f55d 100644 --- a/source/blender/windowmanager/wm_event_system.h +++ b/source/blender/windowmanager/wm_event_system.h @@ -34,6 +34,10 @@ struct ARegion; struct GHOST_TabletData; struct ScrArea; +#ifdef __cplusplus +extern "C" { +#endif + /* wmKeyMap is in DNA_windowmanager.h, it's saveable */ /** Custom types for handlers, for signaling, freeing */ @@ -165,4 +169,8 @@ void wm_dropbox_free(void); void wm_drags_check_ops(bContext *C, const wmEvent *event); void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect); +#ifdef __cplusplus +} +#endif + #endif /* __WM_EVENT_SYSTEM_H__ */ diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index ffed86abfe7..16b872c3c9c 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -26,6 +26,10 @@ #ifndef __WM_EVENT_TYPES_H__ #define __WM_EVENT_TYPES_H__ +#ifdef __cplusplus +extern "C" { +#endif + /* customdata type */ enum { EVT_DATA_TIMER = 2, @@ -489,4 +493,8 @@ enum { GESTURE_MODAL_CIRCLE_SIZE = 11, }; +#ifdef __cplusplus +} +#endif + #endif /* __WM_EVENT_TYPES_H__ */ diff --git a/source/blender/windowmanager/wm_files.h b/source/blender/windowmanager/wm_files.h index 42eab35cdb9..d7f8c3fc583 100644 --- a/source/blender/windowmanager/wm_files.h +++ b/source/blender/windowmanager/wm_files.h @@ -28,6 +28,10 @@ struct Main; struct wmGenericCallback; struct wmOperatorType; +#ifdef __cplusplus +extern "C" { +#endif + /* wm_files.c */ void wm_history_file_read(void); void wm_homefile_read(struct bContext *C, @@ -68,4 +72,8 @@ void WM_OT_append(struct wmOperatorType *ot); void WM_OT_lib_relocate(struct wmOperatorType *ot); void WM_OT_lib_reload(struct wmOperatorType *ot); +#ifdef __cplusplus +} +#endif + #endif /* __WM_FILES_H__ */ diff --git a/source/blender/windowmanager/wm_surface.h b/source/blender/windowmanager/wm_surface.h index bc1cc825e4b..8ab6301e8c9 100644 --- a/source/blender/windowmanager/wm_surface.h +++ b/source/blender/windowmanager/wm_surface.h @@ -27,6 +27,10 @@ struct bContext; +#ifdef __cplusplus +extern "C" { +#endif + typedef struct wmSurface { struct wmSurface *next, *prev; @@ -59,4 +63,8 @@ void wm_surface_clear_drawable(void); void wm_surface_set_drawable(wmSurface *surface, bool activate); void wm_surface_reset_drawable(void); +#ifdef __cplusplus +} +#endif + #endif /* __WM_SURFACE_H__ */ diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h index 5ca5711b4f2..e3e8abae531 100644 --- a/source/blender/windowmanager/wm_window.h +++ b/source/blender/windowmanager/wm_window.h @@ -26,6 +26,10 @@ struct wmOperator; +#ifdef __cplusplus +extern "C" { +#endif + /* *************** internal api ************** */ void wm_ghost_init(bContext *C); void wm_ghost_exit(void); @@ -85,4 +89,8 @@ int wm_window_new_main_exec(bContext *C, struct wmOperator *op); void wm_test_autorun_warning(bContext *C); +#ifdef __cplusplus +} +#endif + #endif /* __WM_WINDOW_H__ */ |