From 1e6b113d8b85d680f7b08980b11fdcc27c8af32b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 6 Mar 2025 16:32:08 +0100 Subject: [PATCH] dix: make SameClient() macro private Not used in any external modules, so need to keep it public. Signed-off-by: Enrico Weigelt, metux IT consult --- Xi/chgdctl.c | 1 + Xi/closedev.c | 7 +++++-- Xi/getselev.c | 2 +- Xi/setdval.c | 1 + Xi/setmode.c | 1 + Xi/ungrdev.c | 6 ++++-- Xi/xigrabdev.c | 1 + dix/devices.c | 1 + dix/resource_priv.h | 3 +++ include/inputstr.h | 3 --- 10 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c index 80e49e3207..b0bd882aac 100644 --- a/Xi/chgdctl.c +++ b/Xi/chgdctl.c @@ -57,6 +57,7 @@ SOFTWARE. #include "dix/exevents_priv.h" #include "dix/input_priv.h" +#include "dix/resource_priv.h" #include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" diff --git a/Xi/closedev.c b/Xi/closedev.c index 15099d054a..7979facd25 100644 --- a/Xi/closedev.c +++ b/Xi/closedev.c @@ -52,11 +52,14 @@ SOFTWARE. #include +#include +#include + +#include "dix/resource_priv.h" + #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ -#include -#include #include "XIstubs.h" #include "exglobals.h" diff --git a/Xi/getselev.c b/Xi/getselev.c index ecc80f1b81..285299041e 100644 --- a/Xi/getselev.c +++ b/Xi/getselev.c @@ -55,7 +55,7 @@ SOFTWARE. #include #include -#include "dix/dix_priv.h" +#include "dix/resource_priv.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window struct */ diff --git a/Xi/setdval.c b/Xi/setdval.c index 289fcb494c..7ef99e46b4 100644 --- a/Xi/setdval.c +++ b/Xi/setdval.c @@ -56,6 +56,7 @@ SOFTWARE. #include #include "dix/input_priv.h" +#include "dix/resource_priv.h" #include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" diff --git a/Xi/setmode.c b/Xi/setmode.c index 9818606a7e..d84e4bcd8b 100644 --- a/Xi/setmode.c +++ b/Xi/setmode.c @@ -56,6 +56,7 @@ SOFTWARE. #include #include "dix/input_priv.h" +#include "dix/resource_priv.h" #include "inputstr.h" /* DeviceIntPtr */ #include "XIstubs.h" diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c index e64d3b99c2..511f39202b 100644 --- a/Xi/ungrdev.c +++ b/Xi/ungrdev.c @@ -52,11 +52,13 @@ SOFTWARE. #include +#include + +#include "dix/resource_priv.h" + #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include #include "exglobals.h" - #include "ungrdev.h" /*********************************************************************** diff --git a/Xi/xigrabdev.c b/Xi/xigrabdev.c index f527024f3b..9920a1766f 100644 --- a/Xi/xigrabdev.c +++ b/Xi/xigrabdev.c @@ -36,6 +36,7 @@ #include "dix/dix_priv.h" #include "dix/exevents_priv.h" +#include "dix/resource_priv.h" #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ diff --git a/dix/devices.c b/dix/devices.c index 0e4a541b59..2fa702583b 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -60,6 +60,7 @@ SOFTWARE. #include "dix/exevents_priv.h" #include "dix/input_priv.h" #include "dix/ptrveloc_priv.h" +#include "dix/resource_priv.h" #include "mi/mi_priv.h" #include "os/bug_priv.h" #include "os/log_priv.h" diff --git a/dix/resource_priv.h b/dix/resource_priv.h index cdbb377c42..d118d13fd8 100644 --- a/dix/resource_priv.h +++ b/dix/resource_priv.h @@ -7,6 +7,9 @@ #include "include/dix.h" +#define SameClient(obj,client) \ + (CLIENT_BITS((obj)->resource) == (client)->clientAsMask) + /* * @brief retrieve client that owns given window * diff --git a/include/inputstr.h b/include/inputstr.h index 8f9de59c21..e62e4731e5 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -60,9 +60,6 @@ SOFTWARE. #define SetBit(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7))) #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7))) -#define SameClient(obj,client) \ - (CLIENT_BITS((obj)->resource) == (client)->clientAsMask) - #define EMASKSIZE (MAXDEVICES + 2) /* This is the last XI2 event supported by the server. If you add