From d5d4aed4e1bc880f049cd326ae70f485e1697d9e Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sat, 16 Feb 2019 14:15:35 -0500
Subject: [PATCH] NetHack Windows curses port build with Jan 2019 PDCurses
 update

Clear up some NetHack warnings with updated PDCurses by using
-DCHTYPE_32

..\win\curses\cursinvt.c(98): warning C4244: 'function': conversion from 'attr_t' to 'int', possible loss of data
..\win\curses\cursinvt.c(101): warning C4244: 'function': conversion from 'attr_t' to 'int', possible loss of data
..\win\curses\cursinvt.c(105): warning C4244: 'function': conversion from 'attr_t' to 'int', possible loss of data
---
 sys/winnt/Makefile.msc           | 6 +++---
 win/win32/vs2017/NetHack.vcxproj | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index 9dd482218..74e585aff 100644
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -1,5 +1,5 @@
-# NetHack 3.6	Makefile.msc	$NHDT-Date: 1546174708 2018/12/30 12:58:28 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.147 $ */
-#       Copyright (c) NetHack PC Development Team 1993-2018
+# NetHack 3.6	Makefile.msc	$NHDT-Date: 1550344504 2019/02/16 19:15:04 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.152 $ */
+#       Copyright (c) NetHack PC Development Team 1993-2019
 #
 #==============================================================================
 # Build Tools Environment
@@ -452,7 +452,7 @@ CL_RECENT=-sdl
 #----------------------------------------------------------------
 
 !IF "$(ADD_CURSES)" == "Y"
-CURSESDEF=-D"CURSES_GRAPHICS" -D"CURSES_BRIEF_INCLUDE"
+CURSESDEF=-D"CURSES_GRAPHICS" -D"CURSES_BRIEF_INCLUDE" -DCHTYPE_32
 !ELSE
 CURSDEF=
 CURSESLIB=
diff --git a/win/win32/vs2017/NetHack.vcxproj b/win/win32/vs2017/NetHack.vcxproj
index be83d0a86..32d50b254 100644
--- a/win/win32/vs2017/NetHack.vcxproj
+++ b/win/win32/vs2017/NetHack.vcxproj
@@ -19,7 +19,7 @@
   <ItemDefinitionGroup Condition="Exists('$(PDCURSES)')">
     <ClCompile>
       <AdditionalIncludeDirectories>$(PDCURSES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-	  <PreprocessorDefinitions>CURSES_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+	  <PreprocessorDefinitions>CURSES_GRAPHICS;CHTYPE_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
 	<Link>
       <AdditionalLibraryDirectories>$(ToolsDir)</AdditionalLibraryDirectories>