diff --git a/sys/winnt/win32api.h b/sys/winnt/win32api.h index 2b63c8005..b4dc7e4c8 100644 --- 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 #include diff --git a/win/win32/winMS.h b/win/win32/winMS.h index 4160f93d8..e34cb006f 100644 --- 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 #include