From: nhmall <nhmall@nethack.org>
Date: Thu, 10 Nov 2022 16:47:31 +0000 (-0500)
Subject: remove code on Windows referencing WIN32_GRAPHICS
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27e311b7330b45024cf68d86a23b3b29ce4c7857;p=nethack

remove code on Windows referencing WIN32_GRAPHICS

As far as I know, there's no such thing as WIN32_GRAPHICS in the
current source tree. The Windows graphical port uses the preprocessor
macro MSWIN_GRAPHICS.
---

diff --git a/src/rip.c b/src/rip.c
index 8d3ae29e6..9245b3813 100644
--- a/src/rip.c
+++ b/src/rip.c
@@ -5,12 +5,14 @@
 
 #include "hack.h"
 
+/* Defining TEXT_TOMBSTONE causes genl_outrip() to exist, but it doesn't
+   necessarily have to be used by a binary with mulitple window-ports */
+
 #if defined(TTY_GRAPHICS) || defined(X11_GRAPHICS) || defined(GEM_GRAPHICS) \
-    || defined(MSWIN_GRAPHICS) || defined(DUMPLOG) \
-    || defined(CURSES_GRAPHICS) || defined(SHIM_GRAPHICS)
+    || defined(DUMPLOG) || defined(CURSES_GRAPHICS) || defined(SHIM_GRAPHICS)
 #define TEXT_TOMBSTONE
 #endif
-#if defined(mac) || defined(__BEOS__) || defined(WIN32_GRAPHICS)
+#if defined(mac) || defined(__BEOS__)
 #ifndef TEXT_TOMBSTONE
 #define TEXT_TOMBSTONE
 #endif
diff --git a/src/windows.c b/src/windows.c
index 918fbd86e..f7981e28e 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -34,9 +34,6 @@ extern struct window_procs amii_procs;
 extern struct window_procs amiv_procs;
 extern void ami_wininit_data(int);
 #endif
-#ifdef WIN32_GRAPHICS
-extern struct window_procs win32_procs;
-#endif
 #ifdef GNOME_GRAPHICS
 /*#include "winGnome.h"*/
 extern struct window_procs Gnome_procs;
@@ -122,9 +119,6 @@ static struct win_choices {
     { &amiv_procs,
       ami_wininit_data CHAINR(0) }, /* Tile version of the game */
 #endif
-#ifdef WIN32_GRAPHICS
-    { &win32_procs, 0 CHAINR(0) },
-#endif
 #ifdef GNOME_GRAPHICS
     { &Gnome_procs, 0 CHAINR(0) },
 #endif