diff options
Diffstat (limited to 'X11/Xwinsock.h')
| -rwxr-xr-x[-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 206836adb..5bbb9d1d9 100644..100755 --- a/X11/Xwinsock.h +++ b/X11/Xwinsock.h @@ -43,7 +43,13 @@ The Open Group. #define FD_SETSIZE 1024 #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 #ifdef Status #undef Status @@ -65,6 +71,12 @@ typedef int Status; #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 |