From a07e572665366e55f0a57c5fee88e80899bf5e28 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 3 Apr 2024 16:21:23 +0200 Subject: [PATCH] xkb: unexport XKBDEVICEINFO() and xkbDevicePrivateKeyRec These aren't used by any drivers/modules, so no need to keep 'em exported. Signed-off-by: Enrico Weigelt, metux IT consult --- include/xkbsrv.h | 6 ------ xkb/xkbsrv_priv.h | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/xkbsrv.h b/include/xkbsrv.h index 746bfab1b..f75cd2b84 100644 --- a/include/xkbsrv.h +++ b/include/xkbsrv.h @@ -211,12 +211,6 @@ typedef struct { DeviceUnwrapProc unwrapProc; } xkbDeviceInfoRec, *xkbDeviceInfoPtr; -extern _X_EXPORT DevPrivateKeyRec xkbDevicePrivateKeyRec; - -#define xkbDevicePrivateKey (&xkbDevicePrivateKeyRec) - -#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey)) - /***====================================================================***/ extern _X_EXPORT int XkbReqCode; diff --git a/xkb/xkbsrv_priv.h b/xkb/xkbsrv_priv.h index 2653122a0..cf01810f0 100644 --- a/xkb/xkbsrv_priv.h +++ b/xkb/xkbsrv_priv.h @@ -12,6 +12,7 @@ #include "dix.h" #include "input.h" #include "misc.h" +#include "privates.h" #include "xkbsrv.h" #include "xkbstr.h" @@ -111,4 +112,8 @@ void XkbMergeLockedPtrBtns(DeviceIntPtr master); void XkbFakeDeviceButton(DeviceIntPtr dev, int press, int button); +extern DevPrivateKeyRec xkbDevicePrivateKeyRec; + +#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, &xkbDevicePrivateKeyRec)) + #endif /* _XSERVER_XKBSRV_PRIV_H_ */