From cb83623942730e7ae8f7099d71857b7d22044ba8 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 6 Mar 2025 16:49:54 +0100
Subject: [PATCH] dix: make RESOURCE_CLIENT_MASK macro private

Not used in any external modules, so no need to keep it public.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/dispatch.c      | 1 +
 dix/gestures.c      | 1 +
 dix/resource_priv.h | 4 ++++
 include/resource.h  | 2 --
 xfixes/saveset.c    | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index f5faaef304..f6068b1996 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -109,6 +109,7 @@ Equipment Corporation.
 #include "dix/input_priv.h"
 #include "dix/gc_priv.h"
 #include "dix/registry_priv.h"
+#include "dix/resource_priv.h"
 #include "dix/screenint_priv.h"
 #include "dix/selection_priv.h"
 #include "dix/window_priv.h"
diff --git a/dix/gestures.c b/dix/gestures.c
index 038bc357c4..22d6d3eb19 100644
--- a/dix/gestures.c
+++ b/dix/gestures.c
@@ -29,6 +29,7 @@
 #include "dix/dixgrabs_priv.h"
 #include "dix/eventconvert.h"
 #include "dix/input_priv.h"
+#include "dix/resource_priv.h"
 #include "mi/mi_priv.h"
 #include "os/bug_priv.h"
 
diff --git a/dix/resource_priv.h b/dix/resource_priv.h
index dbba538f8d..7900e43600 100644
--- a/dix/resource_priv.h
+++ b/dix/resource_priv.h
@@ -6,12 +6,16 @@
 #define _XSERVER_DIX_RESOURCE_PRIV_H
 
 #include "include/dix.h"
+#include "include/resource.h"
 
 #define SameClient(obj,client) \
         (CLIENT_BITS((obj)->resource) == (client)->clientAsMask)
 
 #define SERVER_BIT           (Mask)0x40000000        /* use illegal bit */
 
+/* client field */
+#define RESOURCE_CLIENT_MASK   (((1 << ResourceClientBits()) - 1) << CLIENTOFFSET)
+
 /* extract the client mask from an XID */
 #define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK)
 
diff --git a/include/resource.h b/include/resource.h
index 29c0c8a7fc..aa314f9ed3 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -105,8 +105,6 @@ extern _X_EXPORT unsigned int ResourceClientBits(void);
 #define CLIENTOFFSET	    (RESOURCE_AND_CLIENT_COUNT - ResourceClientBits())
 /* resource field */
 #define RESOURCE_ID_MASK	((1 << CLIENTOFFSET) - 1)
-/* client field */
-#define RESOURCE_CLIENT_MASK	(((1 << ResourceClientBits()) - 1) << CLIENTOFFSET)
 
 #define BAD_RESOURCE 0xe0000000
 
diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index 11d5ea480a..6a7432c65c 100644
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -23,6 +23,7 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "dix/resource_priv.h"
 
 #include "xfixesint.h"