Merge branch 'NetHack-3.6'

sys/winnt/nttty.c

@@ -722,7 +722,6 @@ tty_delay_output()
     }
 }
 
-#ifdef TEXTCOLOR
 /*
  * CLR_BLACK		0
  * CLR_RED		1
@@ -795,10 +794,10 @@ init_ttycolor()
 #endif
     init_ttycolor_completed = TRUE;
 }
-#endif /* TEXTCOLOR */
 
+#if 0
 int
-has_color(int color)
+has_color(int color)        /* this function is commented out */
 {
 #ifdef TEXTCOLOR
     if ((color >= 0) && (color < CLR_MAX))
@@ -810,6 +809,7 @@ has_color(int color)
     else
         return 0;
 }
+#endif
 
 int
 term_attr_fixup(int attrmask)

sys/winnt/stubs.c

@@ -114,12 +114,6 @@ backsp()
     return;
 }
 
-int
-has_color(int color)
-{
-    return 1;
-}
-
 #ifndef NO_MOUSE_ALLOWED
 void
 toggle_mouse_support()