From 77815e87ee9b3f255e4813935eb3d1209f6f0894 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Tue, 7 Jul 2020 21:00:11 -0400
Subject: [PATCH] follow-up to patchlevel and build status consolidation

Also remove redundant prototype of has_color in wintty.h now that
it is in extern.h.

has_color() became an actual function when an array of color capabilities
got added to the windowport interface a while back (it checks that array).
---
 include/config.h  | 32 ++++++++++++++++----------------
 include/config1.h |  3 ++-
 include/wintty.h  |  3 +--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/config.h b/include/config.h
index b8e794bf9..7083a09bf 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6	config.h	$NHDT-Date: 1575245033 2019/12/02 00:03:53 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.126 $ */
+/* NetHack 3.6	config.h	$NHDT-Date: 1594169990 2020/07/08 00:59:50 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.139 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2016. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -7,17 +7,7 @@
 #define CONFIG_H
 
 /*
- * Section 1:   NetHack consolidated version, patchlevel, development status.
- */
-
-#ifdef SHORT_FILENAMES
-#include "patchlev.h"
-#else
-#include "patchlevel.h"
-#endif
-
-/*
- * Section 2:   Operating and window systems selection.
+ * Section 1:   Operating and window systems selection.
  *              Select the version of the OS you are using.
  *              For "UNIX" select BSD, ULTRIX, SYSV, or HPUX in unixconf.h.
  *              A "VMS" option is not needed since the VMS C-compilers
@@ -48,6 +38,16 @@
 
 #include "config1.h" /* should auto-detect MSDOS, MAC, AMIGA, and WIN32 */
 
+/*
+ * Consolidated version, patchlevel, development status.
+ */
+#ifdef SHORT_FILENAMES
+#include "patchlev.h"
+#else
+#include "patchlevel.h"
+#endif
+
+
 /* Windowing systems...
  * Define all of those you want supported in your binary.
  * Some combinations make no sense.  See the installation document.
@@ -154,7 +154,7 @@
 #endif
 
 /*
- * Section 3:   Some global parameters and filenames.
+ * Section 2:   Some global parameters and filenames.
  *
  *              LOGFILE, XLOGFILE, NEWS and PANICLOG refer to files in
  *              the playground directory.  Commenting out LOGFILE, XLOGFILE,
@@ -383,7 +383,7 @@
 #endif /* CHDIR */
 
 /*
- * Section 4:   Definitions that may vary with system type.
+ * Section 3:   Definitions that may vary with system type.
  *              For example, both schar and uchar should be short ints on
  *              the AT&T 3B2/3B5/etc. family.
  */
@@ -476,7 +476,7 @@ typedef unsigned char uchar;
 #endif
 
 /*
- * Section 5:  EXPERIMENTAL STUFF
+ * Section 4:  EXPERIMENTAL STUFF
  *
  * Conditional compilation of new or experimental options are controlled here.
  * Enable any of these at your own risk -- there are almost certainly
@@ -586,7 +586,7 @@ typedef unsigned char uchar;
 
 #define USE_ISAAC64 /* Use cross-plattform, bundled RNG */
 
-/* End of Section 5 */
+/* End of Section 4 */
 
 #ifdef TTY_TILES_ESCCODES
 # ifndef USE_TILES
diff --git a/include/config1.h b/include/config1.h
index 411cf583b..172de10b1 100644
--- a/include/config1.h
+++ b/include/config1.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6	config1.h	$NHDT-Date: 1555702947 2019/04/19 19:42:27 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.21 $ */
+/* NetHack 3.6	config1.h	$NHDT-Date: 1594169991 2020/07/08 00:59:51 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.22 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -28,6 +28,7 @@
 
 #ifdef MSDOS
 #undef UNIX
+#define SHORT_FILENAMES
 #endif
 
 /*
diff --git a/include/wintty.h b/include/wintty.h
index 1bc2e7e64..a13fe5226 100644
--- a/include/wintty.h
+++ b/include/wintty.h
@@ -1,4 +1,4 @@
-/* NetHack 3.6	wintty.h	$NHDT-Date: 1558330405 2019/05/20 05:33:25 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.34 $ */
+/* NetHack 3.6	wintty.h	$NHDT-Date: 1594169998 2020/07/08 00:59:58 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.43 $ */
 /* Copyright (c) David Cohrs, 1991,1992				  */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -153,7 +153,6 @@ E void NDECL(term_end_raw_bold);
 #ifdef TEXTCOLOR
 E void NDECL(term_end_color);
 E void FDECL(term_start_color, (int color));
-E int FDECL(has_color, (int color));
 #endif /* TEXTCOLOR */
 
 /* ### topl.c ### */