From: PatR <rankin@nethack.org>
Date: Wed, 27 Jan 2016 01:39:41 +0000 (-0800)
Subject: revert fix for #H4041 - decl for has_color()
X-Git-Tag: NetHack-3.6.1_RC01~981
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d1a3be7d7964a9406957dd40011f4ce6ef348ce;p=nethack

revert fix for #H4041 - decl for has_color()

Since the attempted fix for the warning about has_color() being
implicitly declared introduced a worse problem of conflicting
declaration in cases where it's already declared, back that change
out.
---

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index d7ce1b127..08440ba5b 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -138,7 +138,6 @@ tty: responding with <return> or <enter> during role, race, &c selection
 	behaved same as <escape> to quit; now it will pick [random] instead
 unix/X11: in top level Makefile, some commented out definitions of VARDATND
 	misspelled pilemark.xbm (as pilemark.xpm)
-unix/tty: fix compile warning about 'has_colors' for some configurations
 unix: options file with CR+LF line ends and an invalid option line resulted in
 	"ad option line: "whatever-the-line-was
 	because embedded carriage return character changed cursor's position
diff --git a/sys/share/unixtty.c b/sys/share/unixtty.c
index efaa176d0..94ffd766d 100644
--- a/sys/share/unixtty.c
+++ b/sys/share/unixtty.c
@@ -335,9 +335,6 @@ int sco_flag_console = 0;
 int sco_map_valid = -1;
 unsigned char sco_chanmap_buf[BSIZE];
 
-#if defined(TTY_GRAPHICS) && defined(TEXTCOLOR)
-extern int NDECL(has_colors);
-#endif
 void NDECL(sco_mapon);
 void NDECL(sco_mapoff);
 void NDECL(check_sco_console);
@@ -402,9 +399,6 @@ init_sco_cons()
 
 int linux_flag_console = 0;
 
-#if defined(TTY_GRAPHICS) && defined(TEXTCOLOR)
-extern int NDECL(has_colors);
-#endif
 void NDECL(linux_mapon);
 void NDECL(linux_mapoff);
 void NDECL(check_linux_console);