From ed7f0bb0aa52576b046dae9e5f3d14d577e30a19 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 6 Mar 2025 16:05:24 +0100 Subject: [PATCH] include/resource.h: replace RESOURCE_CLIENT_BITS by ResourceClientBits() We can write down the function name directly. Nobody else than a few define's in here using that macro. Signed-off-by: Enrico Weigelt, metux IT consult --- include/resource.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/resource.h b/include/resource.h index 92ff04437..b91d94e7e 100644 --- a/include/resource.h +++ b/include/resource.h @@ -102,12 +102,11 @@ typedef uint32_t RESTYPE; extern _X_EXPORT unsigned int ResourceClientBits(void); /* bits and fields within a resource id */ #define RESOURCE_AND_CLIENT_COUNT 29 /* 29 bits for XIDs */ -#define RESOURCE_CLIENT_BITS ResourceClientBits() /* client field offset */ -#define CLIENTOFFSET (RESOURCE_AND_CLIENT_COUNT - RESOURCE_CLIENT_BITS) +#define CLIENTOFFSET (RESOURCE_AND_CLIENT_COUNT - ResourceClientBits()) /* resource field */ #define RESOURCE_ID_MASK ((1 << CLIENTOFFSET) - 1) /* client field */ -#define RESOURCE_CLIENT_MASK (((1 << RESOURCE_CLIENT_BITS) - 1) << CLIENTOFFSET) +#define RESOURCE_CLIENT_MASK (((1 << ResourceClientBits()) - 1) << CLIENTOFFSET) /* extract the client mask from an XID */ #define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK)