From: nhmall <nhmall@nethack.org>
Date: Sat, 7 May 2022 18:34:06 +0000 (-0400)
Subject: Revert "some follow-up for MSDOS build"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4f85df216dd9402e48d4f8112a4b64bc5ab7ca6;p=nethack

Revert "some follow-up for MSDOS build"

This reverts commit 36d3b6432614315b81eeb5b300b3a98265acc016.
---

diff --git a/include/config.h b/include/config.h
index f066c02d9..9c59cb9eb 100644
--- a/include/config.h
+++ b/include/config.h
@@ -661,10 +661,6 @@ typedef unsigned char uchar;
 # endif
 #endif
 
-#if defined(MSDOS) && defined(ENHANCED_SYMBOLS)
-#undef ENHANCED_SYMBOLS
-#endif
-
 #include "integer.h"
 #include "global.h" /* Define everything else according to choices above */
 
diff --git a/win/share/tilemap.c b/win/share/tilemap.c
index b9464191d..02ec1ffe4 100644
--- a/win/share/tilemap.c
+++ b/win/share/tilemap.c
@@ -54,10 +54,6 @@ extern void exit(int);
 #endif
 #endif
 
-#if defined(CROSSCOMPILE) && defined(ENHANCED_SYMBOLS)
-#undef ENHANCED_SYMBOLS
-#endif
-
 struct {
     int idx;
     const char *tilelabel;
diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index b54b8985f..b4494385b 100644
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -3417,10 +3417,6 @@ g_putch(int in_ch)
     return;
 }
 
-
-#if !defined(NO_TERMS) && !defined(WIN32)
-#ifdef ENHANCED_SYMBOLS
-
 void
 g_pututf8(uint8 *utf8str)
 {
@@ -3431,8 +3427,7 @@ g_pututf8(uint8 *utf8str)
     }
     return;
 }
-#endif
-#endif /* !NO_TERMS && !WIN32 */
+#endif /* !WIN32 */
 
 #ifdef CLIPPING
 void
@@ -3547,10 +3542,10 @@ tty_print_glyph(winid window, xchar x, xchar y,
             if (color != NO_COLOR)
                 term_start_color(color);
 #endif /* TEXTCOLOR */
+#if !defined(NO_TERMS) || defined(WIN32)
         }
 #endif
-    }
-    /* iflags.use_color aka iflags.wc_color */
+    }   /* iflags.use_color aka iflags.wc_color */
     /* must be after color check; term_end_color may turn off inverse too;
        BW_LAVA and BW_ICE won't ever be set when color is on;
        (tried bold for ice but it didn't look very good; inverse is easier