From 0a3f6d17dff7e6192447b3542d32c14d151fa598 Mon Sep 17 00:00:00 2001
From: Bart House <bart@barthouse.com>
Date: Sat, 10 Nov 2018 14:38:00 -0800
Subject: [PATCH] Removed the defining of WIN32CONNDEBUG for NethackW. Defined
 NOTTYGRAPHICS for NethackW.

---
 sys/share/pcsys.c                 |  9 ---------
 sys/winnt/winnt.c                 | 15 ++++++---------
 win/win32/vs2017/NetHackW.vcxproj |  2 +-
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/sys/share/pcsys.c b/sys/share/pcsys.c
index 59a78b927..0286ad50b 100644
--- a/sys/share/pcsys.c
+++ b/sys/share/pcsys.c
@@ -501,15 +501,6 @@ int code;
     exit(code);
 }
 
-#ifdef WIN32
-#ifndef TTY_GRAPHICS
-void
-synch_cursor()
-{
-}
-#endif
-#endif
-
 /* Chdir back to original directory
  */
 #ifdef TOS
diff --git a/sys/winnt/winnt.c b/sys/winnt/winnt.c
index 451aae2f0..966b268e0 100644
--- a/sys/winnt/winnt.c
+++ b/sys/winnt/winnt.c
@@ -4,6 +4,8 @@
 
 /*
  *  WIN32 system functions.
+ * 
+ *  Included in both console and window based clients on the windows platform.
  *
  *  Initial Creation: Michael Allison - January 31/93
  *
@@ -229,15 +231,6 @@ Delay(int ms)
     (void) Sleep(ms);
 }
 
-#ifdef TTY_GRAPHICS
-extern void NDECL(backsp);
-#else
-void
-backsp()
-{
-}
-#endif
-
 void
 win32_abort()
 {
@@ -250,9 +243,13 @@ win32_abort()
         msmsg("Execute debug breakpoint wizard?");
         while ((ci = nhgetch()) != '\n') {
             if (ct > 0) {
+#ifdef TTY_GRAPHICS
                 backsp(); /* \b is visible on NT */
+#endif
                 (void) putchar(' ');
+#ifdef TTY_GRAPHICS
                 backsp();
+#endif
                 ct = 0;
                 c = 'n';
             }
diff --git a/win/win32/vs2017/NetHackW.vcxproj b/win/win32/vs2017/NetHackW.vcxproj
index 450210b81..d93276e83 100644
--- a/win/win32/vs2017/NetHackW.vcxproj
+++ b/win/win32/vs2017/NetHackW.vcxproj
@@ -20,7 +20,7 @@
       <Optimization>Disabled</Optimization>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;WIN32CONNDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;NOTTYGRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>