aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2020-02-25 18:27:59 +0100
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2020-02-28 04:04:38 -0300
commitd0dbc40897e9d8f1676dba84e40277c320b6c502 (patch)
tree64b5afad0bad28293cfa84b61d0abcb4a10207ac /src
parent541e15a6cefa4a63d62cb53a33c91af4c80e118b (diff)
Fix compilation with gcc10 / -fno-commo
gcc10 defaults to -fno-common, meaning that non static symbols can only be declared once. Make the declarations in camorama-globals.h extern and declare them as non extern in main.c to fix building with gcc10. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'src')
-rw-r--r--src/camorama-globals.h8
-rw-r--r--src/main.c5
2 files changed, 9 insertions, 4 deletions
diff --git a/src/camorama-globals.h b/src/camorama-globals.h
index 6ca0d96..a123f58 100644
--- a/src/camorama-globals.h
+++ b/src/camorama-globals.h
@@ -29,10 +29,10 @@
G_BEGIN_DECLS
-GtkWidget *prefswindow;
-int frames, frames2, seconds;
-GtkWidget *dentry, *entry2, *string_entry, *format_selection;
-GtkWidget *host_entry, *protocol, *rdir_entry, *filename_entry;
+extern GtkWidget *prefswindow;
+extern int frames, frames2, seconds;
+extern GtkWidget *dentry, *entry2, *string_entry, *format_selection;
+extern GtkWidget *host_entry, *protocol, *rdir_entry, *filename_entry;
G_END_DECLS
#endif /* !CAMORAMA_GLOBALS_H */
diff --git a/src/main.c b/src/main.c
index 6874568..2431c0f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,6 +13,11 @@
#include <libv4l2.h>
#include <stdlib.h>
+GtkWidget *prefswindow;
+int frames, frames2, seconds;
+GtkWidget *dentry, *entry2, *string_entry, *format_selection;
+GtkWidget *host_entry, *protocol, *rdir_entry, *filename_entry;
+
static int ver = 0, max = 0, min;
static int half = 0, use_read = 0, debug = 0;
static gchar *video_dev = NULL;

Privacy Policy