diff options
Diffstat (limited to 'X11/Xwinsock.h')
| -rw-r--r-- | X11/Xwinsock.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/X11/Xwinsock.h b/X11/Xwinsock.h index e6ca7b54b..a81dd7a25 100644 --- a/X11/Xwinsock.h +++ b/X11/Xwinsock.h @@ -39,7 +39,13 @@ The Open Group. # undef XFree86Server #endif -#define BOOL wBOOL +/* + * mingw-w64 headers define BOOL as a typedef, protecting against macros + * mingw.org headers define BOOL in terms of WINBOOL + * ... so try to come up with something which works with both :-) + */ +#define _NO_BOOL_TYPEDEF +#define BOOL WINBOOL #define INT32 wINT32 #undef Status #define Status wStatus @@ -58,6 +64,12 @@ The Open Group. #undef RT_FONT #undef RT_CURSOR +/* + * Older version of this header used to name the windows API bool type wBOOL, + * rather than more standard name WINBOOL + */ +#define wBOOL WINBOOL + #ifdef _XFree86Server # define XFree86Server # undef _XFree86Server |