From 632a48a057a76eebb3fa5885b20e2a8a45392d8b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 15 May 2024 20:20:10 +0200 Subject: [PATCH] Xace: clean up XaceHookDispatch() declaration Overloading real function name with macro makes it unnecessarily complicated. Just rename the real function. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- Xext/xace.c | 3 +-- Xext/xace.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Xext/xace.c b/Xext/xace.c index 580566a5d..71e43f254 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -33,9 +33,8 @@ CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = { 0 }; /* Special-cased hook functions. Called by Xserver. */ -#undef XaceHookDispatch int -XaceHookDispatch(ClientPtr client, int major) +XaceHookDispatch0(ClientPtr client, int major) { /* Call the extension dispatch hook */ ExtensionEntry *ext = GetExtensionEntry(major); diff --git a/Xext/xace.h b/Xext/xace.h index be1f996fb..841ea82a7 100644 --- a/Xext/xace.h +++ b/Xext/xace.h @@ -68,10 +68,10 @@ int XaceHookIsSet(int hook); /* Special-cased hook functions */ -int XaceHookDispatch(ClientPtr ptr, int major); +int XaceHookDispatch0(ClientPtr ptr, int major); #define XaceHookDispatch(c, m) \ ((XaceHooks[XACE_EXT_DISPATCH] && (m) >= EXTENSION_BASE) ? \ - XaceHookDispatch((c), (m)) : \ + XaceHookDispatch0((c), (m)) : \ Success) int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, PropertyPtr *ppProp,