From 6bf49f348d8ce6debc8f645b667422bb9a261a2b Mon Sep 17 00:00:00 2001 From: rbuj Date: Thu, 30 Jan 2020 10:56:12 +0100 Subject: Fix build using gcc 10 -fno-common flag --- libcaja-private/caja-global-preferences.c | 13 +++++++++++++ libcaja-private/caja-global-preferences.h | 24 ++++++++++++------------ 2 files changed, 25 insertions(+), 12 deletions(-) (limited to 'libcaja-private') diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c index 2d3c3466..2f1d9088 100644 --- a/libcaja-private/caja-global-preferences.c +++ b/libcaja-private/caja-global-preferences.c @@ -35,6 +35,19 @@ #include "caja-file-utilities.h" #include "caja-file.h" +GSettings *caja_preferences; +GSettings *caja_media_preferences; +GSettings *caja_window_state; +GSettings *caja_icon_view_preferences; +GSettings *caja_desktop_preferences; +GSettings *caja_tree_sidebar_preferences; +GSettings *caja_compact_view_preferences; +GSettings *caja_list_view_preferences; +GSettings *caja_extension_preferences; + +GSettings *mate_background_preferences; +GSettings *mate_lockdown_preferences; + /* * Public functions */ diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index 2eec02b4..83281157 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -212,18 +212,18 @@ typedef enum void caja_global_preferences_init (void); char *caja_global_preferences_get_default_folder_viewer_preference_as_iid (void); -GSettings *caja_preferences; -GSettings *caja_media_preferences; -GSettings *caja_window_state; -GSettings *caja_icon_view_preferences; -GSettings *caja_desktop_preferences; -GSettings *caja_tree_sidebar_preferences; -GSettings *caja_compact_view_preferences; -GSettings *caja_list_view_preferences; -GSettings *caja_extension_preferences; - -GSettings *mate_background_preferences; -GSettings *mate_lockdown_preferences; +extern GSettings *caja_preferences; +extern GSettings *caja_media_preferences; +extern GSettings *caja_window_state; +extern GSettings *caja_icon_view_preferences; +extern GSettings *caja_desktop_preferences; +extern GSettings *caja_tree_sidebar_preferences; +extern GSettings *caja_compact_view_preferences; +extern GSettings *caja_list_view_preferences; +extern GSettings *caja_extension_preferences; + +extern GSettings *mate_background_preferences; +extern GSettings *mate_lockdown_preferences; G_END_DECLS -- cgit v1.2.1