From 8e945073aa94f6a74c4e89eb3496bce56445a53a Mon Sep 17 00:00:00 2001 From: nhmall Date: Tue, 7 Jul 2020 20:37:06 -0400 Subject: [PATCH] clear up a couple of warnings src\mapglyph.c(330): warning C4013: 'has_color' undefined; assuming extern returning int src\options.c(4820): warning C4101: 'tmpwin': unreferenced local variable src\options.c(4821): warning C4101: 'any': unreferenced local variable --- include/extern.h | 3 ++- src/options.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/extern.h b/include/extern.h index d36c1b831..873b2e632 100644 --- a/include/extern.h +++ b/include/extern.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 extern.h $NHDT-Date: 1593953334 2020/07/05 12:48:54 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.850 $ */ +/* NetHack 3.6 extern.h $NHDT-Date: 1594168620 2020/07/08 00:37:00 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.851 $ */ /* Copyright (c) Steve Creps, 1988. */ /* NetHack may be freely redistributed. See license for details. */ @@ -3036,6 +3036,7 @@ E void FDECL(dump_open_log, (time_t)); E void NDECL(dump_close_log); E void FDECL(dump_redirect, (BOOLEAN_P)); E void FDECL(dump_forward_putstr, (winid, int, const char*, int)); +E int FDECL(has_color, (int)); /* ### winnt.c ### */ #ifdef WIN32 diff --git a/src/options.c b/src/options.c index 5c2fc792b..871fcf21e 100644 --- a/src/options.c +++ b/src/options.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 options.c $NHDT-Date: 1593953355 2020/07/05 12:49:15 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.467 $ */ +/* NetHack 3.7 options.c $NHDT-Date: 1594168619 2020/07/08 00:36:59 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.468 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2008. */ /* NetHack may be freely redistributed. See license for details. */ @@ -4817,10 +4817,10 @@ handler_menu_headings(VOID_ARGS) static int handler_msg_window(VOID_ARGS) { +#if defined(TTY_GRAPHICS) || defined(CURSES_GRAPHICS) winid tmpwin; anything any; -#if defined(TTY_GRAPHICS) || defined(CURSES_GRAPHICS) if (WINDOWPORT("tty") || WINDOWPORT("curses")) { /* by Christian W. Cooper */ menu_item *window_pick = (menu_item *) 0;