xserver: Branch 'master'

[GitLab Mirror]

 dix/dispatch.c |    1 +
 include/os.h   |    2 --
 os/osdep.h     |    2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d18ef33099db2da5a5b4081ed32e117f253fd0bd
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Mar 11 18:47:37 2024 +0100

    os: unexport OnlyListenToOneClient()
    
    Not used by any drivers, so no need to export it.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1385>

diff --git a/dix/dispatch.c b/dix/dispatch.c
index b9daec5ca..77d6217a7 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -110,6 +110,7 @@ Equipment Corporation.
 #include "dix/registry_priv.h"
 #include "dix/screenint_priv.h"
 #include "os/auth.h"
+#include "os/osdep.h"
 
 #include "windowstr.h"
 #include "dixfontstr.h"
diff --git a/include/os.h b/include/os.h
index 92320d949..f38e6c4d8 100644
--- a/include/os.h
+++ b/include/os.h
@@ -147,8 +147,6 @@ static inline void RemoveNotifyFd(int fd)
     (void) SetNotifyFd(fd, NULL, X_NOTIFY_NONE, NULL);
 }
 
-extern _X_EXPORT int OnlyListenToOneClient(ClientPtr /*client */ );
-
 extern _X_EXPORT void ListenToAllClients(void);
 
 extern _X_EXPORT void IgnoreClient(ClientPtr /*client */ );
diff --git a/os/osdep.h b/os/osdep.h
index 318d2b61d..d93a5a926 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -191,4 +191,6 @@ void OsAbort(void) _X_NORETURN;
 void MakeClientGrabPervious(ClientPtr client);
 void MakeClientGrabImpervious(ClientPtr client);
 
+int OnlyListenToOneClient(ClientPtr client);
+
 #endif                          /* _OSDEP_H_ */