This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/xawtv3.git tree:
Subject: xawtv: solve multiple definitions of some vars Author: Dan Fandrich <[email protected]> Date: Sat May 16 01:24:15 2020 +0200 There are some vars that were not declared as external or have multiple definitions. This causes gcc 10.1 to fail. Fix it. Signed-off-by: Mauro Carvalho Chehab <[email protected]> console/fbtv.c | 3 +-- console/scantv.c | 1 - console/streamer.c | 2 +- libng/grab-ng.h | 6 +++--- x11/motv.c | 2 +- x11/mtt.c | 1 - x11/v4lctl.c | 1 - x11/wmhooks.h | 4 ++-- x11/xawtv.c | 2 -- 9 files changed, 8 insertions(+), 14 deletions(-) --- http://git.linuxtv.org/cgit.cgi/xawtv3.git/commit/?id=50dae3ad750e3ab52d6bfc46b685269367d148ef diff --git a/console/fbtv.c b/console/fbtv.c index 278443fcbf3c..8da02197dfd8 100644 --- a/console/fbtv.c +++ b/console/fbtv.c @@ -72,8 +72,7 @@ static struct ng_video_conv *conv; static struct ng_convert_handle *ch; static int dx,dy; -int have_config; -int x11_native_format,have_dga=1,debug; +int x11_native_format,have_dga=1; /*--- channels ------------------------------------------------------------*/ diff --git a/console/scantv.c b/console/scantv.c index 931e707185b0..4736fb7a37be 100644 --- a/console/scantv.c +++ b/console/scantv.c @@ -23,7 +23,6 @@ #include "vbi-data.h" -int debug = 0; int have_dga = 0; int timeout = 3; diff --git a/console/streamer.c b/console/streamer.c index dbd76fade906..527ff0961606 100644 --- a/console/streamer.c +++ b/console/streamer.c @@ -59,7 +59,7 @@ static int quiet = 0, fps = 10000; static int signaled = 0, wait_seconds = 0; -int debug = 0, have_dga = 0; +int have_dga = 0; /* ---------------------------------------------------------------------- */ diff --git a/libng/grab-ng.h b/libng/grab-ng.h index fae6872881cd..0ee20349c580 100644 --- a/libng/grab-ng.h +++ b/libng/grab-ng.h @@ -481,9 +481,9 @@ void ng_color_yuv2rgb_init(void); void ng_writefile_init(void); /* for yuv2rgb using lookup tables (color_lut.c, color_yuv2rgb.c) */ -unsigned long ng_lut_red[256]; -unsigned long ng_lut_green[256]; -unsigned long ng_lut_blue[256]; +extern unsigned long ng_lut_red[256]; +extern unsigned long ng_lut_green[256]; +extern unsigned long ng_lut_blue[256]; void ng_yuv422_to_lut2(unsigned char *dest, unsigned char *s, int p); void ng_yuv422_to_lut4(unsigned char *dest, unsigned char *s, int p); void ng_yuv420p_to_lut2(void *h, struct ng_video_buf *out, diff --git a/x11/motv.c b/x11/motv.c index f6a92e77046a..d4e03162155b 100644 --- a/x11/motv.c +++ b/x11/motv.c @@ -68,7 +68,7 @@ /*----------------------------------------------------------------------*/ -int jpeg_quality, mjpeg_quality, debug; +int jpeg_quality, mjpeg_quality; /*----------------------------------------------------------------------*/ diff --git a/x11/mtt.c b/x11/mtt.c index dfe548c97384..2050797d2e39 100644 --- a/x11/mtt.c +++ b/x11/mtt.c @@ -51,7 +51,6 @@ XtAppContext app_context; Widget app_shell; Display *dpy; -int debug; static String fallback_ressources[] = { #include "mtt.h" diff --git a/x11/v4lctl.c b/x11/v4lctl.c index 050bf308cbbe..bcdc00d2a098 100644 --- a/x11/v4lctl.c +++ b/x11/v4lctl.c @@ -26,7 +26,6 @@ #include "frequencies.h" #include "commands.h" -int debug = 0; int have_dga = 0; #ifdef HAVE_LIBXV Display *dpy; diff --git a/x11/wmhooks.h b/x11/wmhooks.h index d0341fa9e30e..50c55a0adafd 100644 --- a/x11/wmhooks.h +++ b/x11/wmhooks.h @@ -1,3 +1,3 @@ void wm_detect(Display *dpy); -void (*wm_stay_on_top)(Display *dpy, Window win, int state); -void (*wm_fullscreen)(Display *dpy, Window win, int state); +extern void (*wm_stay_on_top)(Display *dpy, Window win, int state); +extern void (*wm_fullscreen)(Display *dpy, Window win, int state); diff --git a/x11/xawtv.c b/x11/xawtv.c index b87f53ed69cc..bd6e499a0c9c 100644 --- a/x11/xawtv.c +++ b/x11/xawtv.c @@ -82,11 +82,9 @@ Widget chan_viewport, chan_box; Pixmap tv_pix; struct vbi_window *vtx; -int have_config = 0; XtIntervalId audio_timer; XtIntervalId unmute_timer; int unmute_pending = 0; -int debug = 0; int window_configured = 0; char modename[64]; _______________________________________________ linuxtv-commits mailing list [email protected] https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
