1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-10 15:59:53 +00:00

Avoid two more encroachments by Windows into the user's namespace.

"hyper" is described here: https://sourceforge.net/p/mingw/mailman/message/8593274/

"rad1" is described here: http://lolengine.net/blog/2011/3/4/fuck-you-microsoft-near-far-macros
This commit is contained in:
Arthur O'Dwyer 2018-06-27 03:12:48 -07:00
parent 121e2a60d3
commit 034514778d

View File

@ -250,6 +250,11 @@
#define HYPERPATH "" #define HYPERPATH ""
#endif #endif
#if ISWINDOWS
#define hyper fake_hyper // avoid "hyper" typedef in <_mingw.h>
#define WIN32_LEAN_AND_MEAN // avoid "rad1" macro in <windows.h>
#endif
#include <stdio.h> #include <stdio.h>
#if CAP_SDL #if CAP_SDL
@ -407,3 +412,7 @@ extern "C" {
#if CAP_SDL #if CAP_SDL
union SDL_Event; union SDL_Event;
#endif #endif
#if ISWINDOWS
#undef hyper // avoid "hyper" typedef in <_mingw.h>
#endif