XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent name clash on Windows w/ RT_* defines

Browse Source 
Windows' native headers using some our RT_* define's names for other things.
Since the naming isn't very nice anyways, introducing some new ones
(X11_RESTYPE_NONE, X11_RESTYPE_FONT, X11_RESTYPE_CURSOR) and define the old
ones as an alias to them, in case some out-of-tree code still uses them.

With thins change, we don't need to be so extremely careful about include
ordering and have explicit #undef's in order to prevent name clashes on
Win32 targets.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1355>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-03-04 15:08:32 +01:00
committed by Alan Coopersmith
parent f789dca4e9
commit 232cad9ec3
52 changed files with 183 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
present/present_event.c
View File

@@ -52,7 +52,7 @@ present_free_events(WindowPtr window)
return;
while ((event = window_priv->events))
FreeResource(event->id, RT_NONE);
FreeResource(event->id, X11_RESTYPE_NONE);
}
static void
@@ -224,7 +224,7 @@ present_select_input(ClientPtr client, XID eid, WindowPtr window, CARD32 mask)
if (mask)
event->mask = mask;
else
FreeResource(eid, RT_NONE);
FreeResource(eid, X11_RESTYPE_NONE);
return Success;
}
if (ret != BadValue)