Fix build errors with Visual Studio 2017 using latest SDK. We have yet another global...

diff --git a/sys/winnt/win32api.h b/sys/winnt/win32api.h
index 2b63c80052b7a51cbf349326c97feec0153a48fe..b4dc7e4c81761ae740a63d5f2005cd35dd85f490 100644 (file)
--- a/sys/winnt/win32api.h
+++ b/sys/winnt/win32api.h
@@ -17,6 +17,13 @@
 
 #define WIN32_LEAN_AND_MEAN
 
+#undef Protection /* We have a global name space collision.  No source file
+                     using win32api.h should be using the Protection macro
+                     from youprop.h.
+                     A better fix would be to ensure we include all window
+                     header files before we start clobbering the global name
+                     space with NetHack specific macros. */
+
 #include <windows.h>
 #include <commctrl.h>
 

diff --git a/win/win32/winMS.h b/win/win32/winMS.h
index 4160f93d821a6b990239d5ddbb35d044173121f8..e34cb006f749b932d51a56940a923acaca2ee0ce 100644 (file)
--- a/win/win32/winMS.h
+++ b/win/win32/winMS.h
@@ -20,6 +20,13 @@
 #endif
 #endif
 
+#undef Protection /* We have a global name space collision.  No source file
+                     using win32api.h should be using the Protection macro
+                     from youprop.h.
+                     A better fix would be to ensure we include all window
+                     header files before we start clobbering the global name
+                     space with NetHack specific macros. */
+
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <commctrl.h>