diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-03-04 15:08:32 +0100 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-04-15 18:59:23 -0700 |
| commit | 232cad9ec36631379b23ce29d577332f82565803 (patch) | |
| tree | 610b389034511f242886ffab99b22593a6fd1592 /present | |
| parent | f789dca4e9e0ca5cfcdb1f95a7479cb1ca113738 (diff) | |
prevent name clash on Windows w/ RT_* defines
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>
Diffstat (limited to 'present')
| -rw-r--r-- | present/present_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/present/present_event.c b/present/present_event.c index 849732dc8..b35609b23 100644 --- a/present/present_event.c +++ b/present/present_event.c @@ -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) |