From 8aff1ee68542973eba7c5d56bb602628b83c0bcf Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 25 Feb 2025 19:15:06 +0100 Subject: [PATCH] (!1854) Xi: unexport AssignTypeAndName() Not used by any external drivers, so no need to keep it exported. Signed-off-by: Enrico Weigelt, metux IT consult --- Xi/extinit.c | 1 + dix/input_priv.h | 2 ++ hw/vfb/InitInput.c | 1 + include/inputstr.h | 4 ---- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Xi/extinit.c b/Xi/extinit.c index 5566d297d..8117bf0f6 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -61,6 +61,7 @@ SOFTWARE. #include #include "dix/dix_priv.h" +#include "dix/input_priv.h" #include "dix/exevents_priv.h" #include "dix/extension_priv.h" #include "miext/extinit_priv.h" diff --git a/dix/input_priv.h b/dix/input_priv.h index 7ac2d2839..8d9077128 100644 --- a/dix/input_priv.h +++ b/dix/input_priv.h @@ -342,4 +342,6 @@ static inline int CountBits(const uint8_t * mask, int len) return ret; } +void AssignTypeAndName(DeviceIntPtr dev, Atom type, const char *name); + #endif /* _XSERVER_INPUT_PRIV_H */ diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index 8f8e334b2..4f73a3b19 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -33,6 +33,7 @@ from The Open Group. #include #include +#include "dix/input_priv.h" #include "mi/mi_priv.h" #include "scrnintstr.h" diff --git a/include/inputstr.h b/include/inputstr.h index aa4c9a37f..e62e4731e 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -56,10 +56,6 @@ SOFTWARE. #include "cursorstr.h" #include "privates.h" -extern _X_EXPORT void AssignTypeAndName(DeviceIntPtr dev, - Atom type, - const char *name); - #define BitIsOn(ptr, bit) (!!(((const BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))) #define SetBit(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7))) #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))