From 5f624baebe43889bb2810720cb9cc6d0812f49cb Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 14 Aug 2021 16:52:11 +0100 Subject: [PATCH] disobedience/disobedience.h: Declare variables as `extern'. Otherwise we get a multiple-definition link failure with recent toolchains (GCC 10 on Debian bullseye). Fixes #60. --- disobedience/disobedience.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h index 94e3022..454a65f 100644 --- a/disobedience/disobedience.h +++ b/disobedience/disobedience.h @@ -167,7 +167,7 @@ void all_update(void); GtkWidget *menubar(GtkWidget *w); /* Create the menu bar */ -int full_mode; +extern int full_mode; void users_set_sensitive(int sensitive); @@ -228,7 +228,7 @@ extern const GtkTargetEntry choose_targets[]; void login_box(void); -GtkWidget *login_window; +extern GtkWidget *login_window; /* User management */ @@ -251,7 +251,7 @@ void stop_rtp(void); void load_rtp_config(void); void save_rtp_config(void); void change_rtp_api(const char *api); -const char *rtp_api; +extern const char *rtp_api; int rtp_setvol(int *l, int *r); int rtp_getvol(int *l, int *r); -- 2.11.0