From: Sergei Trofimovich <>
Date: Sun, 26 Jan 2020 11:05:18 +0000 (+0000)
Subject: Fix #746: src/options: fix build failure against gcc-10
X-Git-Tag: v1.6~96
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=3ea5fa39d37e56443907255fbc81cb1b83dc9978

Fix #746: src/options: fix build failure against gcc-10

https://github.com/BestImageViewer/geeqie/pull/746
---

diff --git a/src/bar_exif.h b/src/bar_exif.h
index 63c30d4b..1395e842 100644
--- a/src/bar_exif.h
+++ b/src/bar_exif.h
@@ -28,9 +28,6 @@ void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_n
 void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values);
 
 /* these are exposed for when duplication of the exif bar's text is needed */
-
-const gchar **bar_exif_key_list;
-const gint bar_exif_key_count;
 GList *bar_pane_exif_list();
 
 #endif
diff --git a/src/options.c b/src/options.c
index 99459381..bab26acb 100644
--- a/src/options.c
+++ b/src/options.c
@@ -32,6 +32,9 @@
 #include "ui_fileops.h"
 #include "window.h"
 
+ConfOptions *options;
+CommandLine *command_line;
+
 ConfOptions *init_options(ConfOptions *options)
 {
 	gint i;
diff --git a/src/options.h b/src/options.h
index fcfe961a..02ff8fac 100644
--- a/src/options.h
+++ b/src/options.h
@@ -329,8 +329,8 @@ struct _ConfOptions
 	GList *disabled_plugins;
 };
 
-ConfOptions *options;
-CommandLine *command_line;
+extern ConfOptions *options;
+extern CommandLine *command_line;
 
 ConfOptions *init_options(ConfOptions *options);
 void setup_default_options(ConfOptions *options);