Import Logan Rosen's patch to fix FTBFS with GCC 10
Jose G. López
3 years ago
| 0 | From dfeb8b6a4b2fdc9ba61ed64a72a73c44cc5a9faf Mon Sep 17 00:00:00 2001 | |
| 1 | From: Shlomi Fish <shlomif@shlomifish.org> | |
| 2 | Date: Tue, 26 May 2020 12:23:14 +0300 | |
| 3 | Subject: [PATCH] extern decls fix for recent gcc. | |
| 4 | ||
| 5 | --- | |
| 6 | src/grg_attachs.h | 2 +- | |
| 7 | src/grg_entries.h | 2 +- | |
| 8 | src/grg_menus.c | 15 +++++++++++++++ | |
| 9 | src/grg_menus.h | 14 +++++++------- | |
| 10 | src/grg_pix.h | 14 +++++++------- | |
| 11 | src/grg_prefs.h | 36 ++++++++++++++++++------------------ | |
| 12 | src/grg_recent_dox.h | 8 ++++---- | |
| 13 | src/grg_widgets.h | 2 +- | |
| 14 | src/gringotts.h | 6 +++--- | |
| 15 | 10 files changed, 58 insertions(+), 42 deletions(-) | |
| 16 | ||
| 17 | diff --git a/src/grg_attachs.h b/src/grg_attachs.h | |
| 18 | index d8df7ac..1442ff9 100644 | |
| 19 | --- a/src/grg_attachs.h | |
| 20 | +++ b/src/grg_attachs.h | |
| 21 | @@ -24,7 +24,7 @@ | |
| 22 | ||
| 23 | #include <gtk/gtk.h> | |
| 24 | ||
| 25 | -gint current_attach_ID; | |
| 26 | +extern gint current_attach_ID; | |
| 27 | ||
| 28 | gint grg_attach_file (gchar * path, GtkWidget * parent); | |
| 29 | void grg_remove_attachment (void); | |
| 30 | diff --git a/src/grg_entries.h b/src/grg_entries.h | |
| 31 | index 63102d3..dc3872a 100644 | |
| 32 | --- a/src/grg_entries.h | |
| 33 | +++ b/src/grg_entries.h | |
| 34 | @@ -24,7 +24,7 @@ | |
| 35 | ||
| 36 | /* current element. */ | |
| 37 | /* MUST BE USED ONLY BY grg_attachs.h !!!! */ | |
| 38 | -GList *current; | |
| 39 | +extern GList *current; | |
| 40 | ||
| 41 | /* Appends a new entry to the list */ | |
| 42 | void grg_entries_append (void); | |
| 43 | diff --git a/src/grg_menus.c b/src/grg_menus.c | |
| 44 | index f952e2a..50163a1 100644 | |
| 45 | --- a/src/grg_menus.c | |
| 46 | +++ b/src/grg_menus.c | |
| 47 | @@ -31,6 +31,21 @@ | |
| 48 | ||
| 49 | #include <gdk/gdkkeysyms.h> | |
| 50 | ||
| 51 | +/* menu File */ | |
| 52 | +GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit; | |
| 53 | + | |
| 54 | +/* menu Edit */ | |
| 55 | +GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref; | |
| 56 | + | |
| 57 | +/* menu Navigation */ | |
| 58 | +GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind; | |
| 59 | + | |
| 60 | +/* menu Tools */ | |
| 61 | +GtkWidget *bwipe; | |
| 62 | + | |
| 63 | +/* menu Help */ | |
| 64 | +GtkWidget *babo; | |
| 65 | + | |
| 66 | #define NEW_MENU_ITEM(var, text, cb, data, parent, img, key, mod) \ | |
| 67 | var = gtk_image_menu_item_new_with_mnemonic(text); \ | |
| 68 | gtk_menu_shell_append (GTK_MENU_SHELL (parent), var); \ | |
| 69 | diff --git a/src/grg_menus.h b/src/grg_menus.h | |
| 70 | index 47e5088..eb1ca45 100644 | |
| 71 | --- a/src/grg_menus.h | |
| 72 | +++ b/src/grg_menus.h | |
| 73 | @@ -25,22 +25,22 @@ | |
| 74 | #include <gtk/gtk.h> | |
| 75 | ||
| 76 | /* menu File */ | |
| 77 | -GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit; | |
| 78 | +extern GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit; | |
| 79 | ||
| 80 | /* menu Edit */ | |
| 81 | -GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref; | |
| 82 | +extern GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref; | |
| 83 | ||
| 84 | /* menu Navigation */ | |
| 85 | -GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind; | |
| 86 | +extern GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind; | |
| 87 | ||
| 88 | /* menu Tools */ | |
| 89 | -GtkWidget *bwipe; | |
| 90 | +extern GtkWidget *bwipe; | |
| 91 | ||
| 92 | /* menu Help */ | |
| 93 | -GtkWidget *babo; | |
| 94 | +extern GtkWidget *babo; | |
| 95 | ||
| 96 | /*Makes a menubar, within a handlebox, and returns the GtkWidget */ | |
| 97 | -GtkWidget *grg_menu_create (GtkWidget * window); | |
| 98 | +extern GtkWidget *grg_menu_create (GtkWidget * window); | |
| 99 | ||
| 100 | -void grg_menu_update (void); | |
| 101 | +extern void grg_menu_update (void); | |
| 102 | #endif | |
| 103 | diff --git a/src/grg_pix.h b/src/grg_pix.h | |
| 104 | index bbb92b2..23937b6 100644 | |
| 105 | --- a/src/grg_pix.h | |
| 106 | +++ b/src/grg_pix.h | |
| 107 | @@ -22,13 +22,13 @@ | |
| 108 | #ifndef GRG_PIX_H | |
| 109 | #define GRG_PIX_H | |
| 110 | ||
| 111 | -const char *red_xpm[58]; | |
| 112 | -const char *yellow_xpm[58]; | |
| 113 | -const char *green_xpm[58]; | |
| 114 | -const char *optimal_xpm[94]; | |
| 115 | +extern const char *red_xpm[58]; | |
| 116 | +extern const char *yellow_xpm[58]; | |
| 117 | +extern const char *green_xpm[58]; | |
| 118 | +extern const char *optimal_xpm[94]; | |
| 119 | ||
| 120 | -const char *splash_xpm[180]; | |
| 121 | +extern const char *splash_xpm[180]; | |
| 122 | ||
| 123 | -const char *wait_xpm[82]; | |
| 124 | -const char *clip_xpm[17]; | |
| 125 | +extern const char *wait_xpm[82]; | |
| 126 | +extern const char *clip_xpm[17]; | |
| 127 | #endif | |
| 128 | diff --git a/src/grg_prefs.h b/src/grg_prefs.h | |
| 129 | index 7510633..cf37ced 100644 | |
| 130 | --- a/src/grg_prefs.h | |
| 131 | +++ b/src/grg_prefs.h | |
| 132 | @@ -24,24 +24,24 @@ | |
| 133 | ||
| 134 | #include <gtk/gtk.h> | |
| 135 | ||
| 136 | -gboolean grg_prefs_warn4overwrite; | |
| 137 | -gboolean grg_prefs_bak_files; | |
| 138 | -gboolean grg_prefs_splash; | |
| 139 | -gboolean grg_prefs_tray; | |
| 140 | -gboolean grg_prefs_clip_clear_on_close; | |
| 141 | -gboolean grg_prefs_clip_clear_on_quit; | |
| 142 | -gint grg_prefs_xpire; | |
| 143 | -gint grg_prefs_wipe_passes; | |
| 144 | -gint grg_prefs_mainwin_width, grg_prefs_mainwin_height; | |
| 145 | +extern gboolean grg_prefs_warn4overwrite; | |
| 146 | +extern gboolean grg_prefs_bak_files; | |
| 147 | +extern gboolean grg_prefs_splash; | |
| 148 | +extern gboolean grg_prefs_tray; | |
| 149 | +extern gboolean grg_prefs_clip_clear_on_close; | |
| 150 | +extern gboolean grg_prefs_clip_clear_on_quit; | |
| 151 | +extern gint grg_prefs_xpire; | |
| 152 | +extern gint grg_prefs_wipe_passes; | |
| 153 | +extern gint grg_prefs_mainwin_width, grg_prefs_mainwin_height; | |
| 154 | ||
| 155 | -gchar *get_pref_file (void); | |
| 156 | -void set_pref_file (const gchar * newval); | |
| 157 | -gchar *get_pref_font_string (void); | |
| 158 | -void set_pref_font_string (const gchar * newval); | |
| 159 | -void set_pref_font_string_from_editor (void); | |
| 160 | +extern gchar *get_pref_file (void); | |
| 161 | +extern void set_pref_file (const gchar * newval); | |
| 162 | +extern gchar *get_pref_font_string (void); | |
| 163 | +extern void set_pref_font_string (const gchar * newval); | |
| 164 | +extern void set_pref_font_string_from_editor (void); | |
| 165 | ||
| 166 | -void grg_pref_dialog (GtkWidget * parent); | |
| 167 | -void grg_prefs_update (void); | |
| 168 | -void grg_prefs_free (void); | |
| 169 | -void grg_prefs_reset_defaults (void); | |
| 170 | +extern void grg_pref_dialog (GtkWidget * parent); | |
| 171 | +extern void grg_prefs_update (void); | |
| 172 | +extern void grg_prefs_free (void); | |
| 173 | +extern void grg_prefs_reset_defaults (void); | |
| 174 | #endif | |
| 175 | diff --git a/src/grg_recent_dox.h b/src/grg_recent_dox.h | |
| 176 | index 8afe08c..e074053 100644 | |
| 177 | --- a/src/grg_recent_dox.h | |
| 178 | +++ b/src/grg_recent_dox.h | |
| 179 | @@ -24,10 +24,10 @@ | |
| 180 | ||
| 181 | #define GRG_RECENT_LIMIT 6 | |
| 182 | ||
| 183 | -GSList *grg_recent_dox; | |
| 184 | +extern GSList *grg_recent_dox; | |
| 185 | ||
| 186 | -void grg_recent_dox_init (void); | |
| 187 | -void grg_recent_dox_deinit (void); | |
| 188 | -void grg_recent_dox_push (const gchar * file); | |
| 189 | +extern void grg_recent_dox_init (void); | |
| 190 | +extern void grg_recent_dox_deinit (void); | |
| 191 | +extern void grg_recent_dox_push (const gchar * file); | |
| 192 | ||
| 193 | #endif | |
| 194 | diff --git a/src/grg_widgets.h b/src/grg_widgets.h | |
| 195 | index e833aac..b58ae74 100644 | |
| 196 | --- a/src/grg_widgets.h | |
| 197 | +++ b/src/grg_widgets.h | |
| 198 | @@ -25,7 +25,7 @@ | |
| 199 | #include "grg_defs.h" | |
| 200 | #include <gtk/gtk.h> | |
| 201 | ||
| 202 | -gboolean mapIsUTF; | |
| 203 | +extern gboolean mapIsUTF; | |
| 204 | ||
| 205 | /* Shows and manages a dialog that asks for a string. */ | |
| 206 | gchar *grg_input_dialog (gchar * title, gchar * qtext, gchar * preset, | |
| 207 | diff --git a/src/gringotts.h b/src/gringotts.h | |
| 208 | index ba1497e..7f47712 100644 | |
| 209 | --- a/src/gringotts.h | |
| 210 | +++ b/src/gringotts.h | |
| 211 | @@ -24,10 +24,10 @@ | |
| 212 | ||
| 213 | #include "grg_defs.h" | |
| 214 | ||
| 215 | -GList *garbage; | |
| 216 | +extern GList *garbage; | |
| 217 | ||
| 218 | -GRG_CTX gctx; | |
| 219 | -glong pwdbirth; | |
| 220 | +extern GRG_CTX gctx; | |
| 221 | +extern glong pwdbirth; | |
| 222 | ||
| 223 | /*callbacks for menu items */ | |
| 224 |