From: nhmall Date: Mon, 27 Jan 2020 13:23:56 +0000 (-0500) Subject: avoid link error with gcc 10 which enables -fno-common by default X-Git-Tag: NetHack-3.6.5_Released~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0305d0ae41e14d9a42d1abd30a0dbb0d893b6d2e;p=nethack avoid link error with gcc 10 which enables -fno-common by default --- diff --git a/src/windows.c b/src/windows.c index 01ef4ccb9..94ac40f3e 100644 --- a/src/windows.c +++ b/src/windows.c @@ -878,7 +878,6 @@ const char *status_fieldnm[MAXBLSTATS]; const char *status_fieldfmt[MAXBLSTATS]; char *status_vals[MAXBLSTATS]; boolean status_activefields[MAXBLSTATS]; -NEARDATA winid WIN_STATUS; void genl_status_init() diff --git a/win/X11/winX.c b/win/X11/winX.c index d5b7d263c..463c03026 100644 --- a/win/X11/winX.c +++ b/win/X11/winX.c @@ -95,9 +95,6 @@ static XtSignalId X11_sig_id; #endif #endif -/* this is only needed until X11_status_* routines are written */ -extern NEARDATA winid WIN_STATUS; - /* Interface definition, for windows.c */ struct window_procs X11_procs = { "X11", diff --git a/win/gnome/gnbind.c b/win/gnome/gnbind.c index d23018cd8..53dee7232 100644 --- a/win/gnome/gnbind.c +++ b/win/gnome/gnbind.c @@ -19,9 +19,6 @@ winid WIN_WORN = WIN_ERR; extern void tty_raw_print(const char *); extern void tty_raw_print_bold(const char *); -/* this is only needed until gnome_status_* routines are written */ -extern NEARDATA winid WIN_STATUS; - /* Interface definition, for windows.c */ struct window_procs Gnome_procs = { "Gnome", WC_COLOR | WC_HILITE_PET | WC_INVERSE, 0L, diff --git a/win/tty/wintty.c b/win/tty/wintty.c index ea02b631e..d7ffec68e 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -74,9 +74,6 @@ extern short glyph2tile[]; extern char mapped_menu_cmds[]; /* from options.c */ -/* this is only needed until tty_status_* routines are written */ -extern NEARDATA winid WIN_STATUS; - /* Interface definition, for windows.c */ struct window_procs tty_procs = { "tty",