From 1891a8dc147cfaf63b6db0249f1520f2c091fb85 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Mar 2024 14:51:53 +0100 Subject: [PATCH] os: unexport client id retrieval functions These aren't used by any (known) external modules, thus no need to export them. Signed-off-by: Enrico Weigelt, metux IT consult --- dix/grabs.c | 2 +- dix/window.c | 1 + hw/xwayland/xwayland-xtest.c | 1 + include/client.h | 8 -------- os/access.c | 1 + os/client_priv.h | 5 +++++ 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dix/grabs.c b/dix/grabs.c index fb768b06c..fc27f8612 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -55,6 +55,7 @@ SOFTWARE. #include "dix/dix_priv.h" #include "dix/exevents_priv.h" #include "os/auth.h" +#include "os/client_priv.h" #include "misc.h" #include "windowstr.h" @@ -64,7 +65,6 @@ SOFTWARE. #include "xace.h" #include "exglobals.h" #include "inpututils.h" -#include "client.h" #define BITMASK(i) (((Mask)1) << ((i) & 31)) #define MASKIDX(i) ((i) >> 5) diff --git a/dix/window.c b/dix/window.c index 500582b9c..573d195ab 100644 --- a/dix/window.c +++ b/dix/window.c @@ -105,6 +105,7 @@ Equipment Corporation. #include "dix/input_priv.h" #include "dix/property_priv.h" #include "os/auth.h" +#include "os/client_priv.h" #include "os/screensaver.h" #include "misc.h" diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c index 5541fecef..0bb65399b 100644 --- a/hw/xwayland/xwayland-xtest.c +++ b/hw/xwayland/xwayland-xtest.c @@ -32,6 +32,7 @@ #include "dix/dix_priv.h" #include "dix/input_priv.h" +#include "os/client_priv.h" #include #include diff --git a/include/client.h b/include/client.h index 1f3d9065f..d71dc8d05 100644 --- a/include/client.h +++ b/include/client.h @@ -30,15 +30,7 @@ #include #endif /* HAVE_DIX_CONFIG_H */ -#include -#include - struct _Client; typedef struct _ClientId *ClientIdPtr; -/* Query cached client IDs. Exported on purpose for drivers. */ -extern _X_EXPORT pid_t GetClientPid(struct _Client *client); -extern _X_EXPORT const char *GetClientCmdName(struct _Client *client); -extern _X_EXPORT const char *GetClientCmdArgs(struct _Client *client); - #endif /* CLIENT_H */ diff --git a/os/access.c b/os/access.c index d3fce1ec6..cebd39a4f 100644 --- a/os/access.c +++ b/os/access.c @@ -174,6 +174,7 @@ SOFTWARE. #include #include "os/auth.h" +#include "os/client_priv.h" #include "dixstruct.h" #include "osdep.h" diff --git a/os/client_priv.h b/os/client_priv.h index 27dc4f36b..03dbd4099 100644 --- a/os/client_priv.h +++ b/os/client_priv.h @@ -29,4 +29,9 @@ void ReleaseClientIds(struct _Client *client); pid_t DetermineClientPid(struct _Client *client); void DetermineClientCmd(pid_t, const char **cmdname, const char **cmdargs); +/* Query cached client IDs. Exported on purpose for drivers. */ +pid_t GetClientPid(struct _Client *client); +const char *GetClientCmdName(struct _Client *client); +const char *GetClientCmdArgs(struct _Client *client); + #endif /* _XSERVER_DIX_CLIENT_PRIV_H */