fdo-mirrors/xorg-xorgproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xorgproto.git synced 2026-05-05 00:38:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Win32: Fix collision over 'ControlMask'

Browse source 
Workaround the collision between ControlMask #defined in X11/X.h and
ControlMask used as the name of a structure member in
w32api/processthreadsapi.h in w32api 10.0.0
This commit is contained in:
Jon Turney 2022-06-22 10:35:26 +01:00 • committed by Alan Coopersmith
parent 7ca8d2042d
commit ede86501a4
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/X11/Xwindows.h
View file

@ -72,6 +72,8 @@ The Open Group.
#define ATOM wATOM #define ATOM wATOM
#define BYTE wBYTE #define BYTE wBYTE
#define FreeResource wFreeResource #define FreeResource wFreeResource
#pragma push_macro ("ControlMask")
#undef ControlMask
#include <windows.h> #include <windows.h>
#undef NOMINMAX #undef NOMINMAX
#undef Status #undef Status
@ -83,6 +85,7 @@ The Open Group.
#undef LONG64 #undef LONG64
#undef ATOM #undef ATOM
#undef FreeResource #undef FreeResource
#pragma pop_macro ("ControlMask")
#undef CreateWindowA #undef CreateWindowA
/* /*

3
include/X11/Xwinsock.h
View file

@ -52,6 +52,8 @@ The Open Group.
#define ATOM wATOM #define ATOM wATOM
#define BYTE wBYTE #define BYTE wBYTE
#define FreeResource wFreeResource #define FreeResource wFreeResource
#pragma push_macro ("ControlMask")
#undef ControlMask
#include <winsock2.h> #include <winsock2.h>
#undef Status #undef Status
#define Status int #define Status int
@ -60,6 +62,7 @@ The Open Group.
#undef INT32 #undef INT32
#undef ATOM #undef ATOM
#undef FreeResource #undef FreeResource
#pragma pop_macro ("ControlMask")
#undef CreateWindowA #undef CreateWindowA
#undef RT_FONT #undef RT_FONT
#undef RT_CURSOR #undef RT_CURSOR