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 /record | |
| 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 'record')
| -rw-r--r-- | record/record.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/record/record.c b/record/record.c index ca9254ce1..88fbf9c85 100644 --- a/record/record.c +++ b/record/record.c @@ -2457,7 +2457,7 @@ ProcRecordFreeContext(ClientPtr client) REQUEST_SIZE_MATCH(xRecordFreeContextReq); VERIFY_CONTEXT(pContext, stuff->context, client); - FreeResource(stuff->context, RT_NONE); + FreeResource(stuff->context, X11_RESTYPE_NONE); return Success; } /* ProcRecordFreeContext */ |