xserver: Branch 'master'

[GitLab Mirror]

 Xext/security.c |    1 +
 dix/dix_priv.h  |    2 ++
 dix/grabs.c     |    3 +++
 include/dix.h   |    2 --
 os/connection.c |    3 +++
 5 files changed, 9 insertions(+), 2 deletions(-)

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

    dix: unexport CloseDownClient()
    
    This function isn't used by 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/1383>

diff --git a/Xext/security.c b/Xext/security.c
index e28c3ef45..84c468e62 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -28,6 +28,7 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
 
 #include "scrnintstr.h"
diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index 181c0eda8..43eb0c706 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -36,4 +36,6 @@ void ClearWorkQueue(void);
 void ProcessWorkQueue(void);
 void ProcessWorkQueueZombies(void);
 
+void CloseDownClient(ClientPtr client);
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/grabs.c b/dix/grabs.c
index 53ba1d6b9..42ff04a8b 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -53,6 +53,9 @@ SOFTWARE.
 #include "misc.h"
 #include <X11/Xproto.h>
 #include <X11/extensions/XI2.h>
+
+#include "dix/dix_priv.h"
+
 #include "windowstr.h"
 #include "inputstr.h"
 #include "cursorstr.h"
diff --git a/include/dix.h b/include/dix.h
index a3a9f5309..8f0336d4c 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -160,8 +160,6 @@ extern _X_EXPORT ClientPtr GetCurrentClient(void);
 extern _X_EXPORT void SetInputCheck(HWEventQueuePtr /*c0 */ ,
                                     HWEventQueuePtr /*c1 */ );
 
-extern _X_EXPORT void CloseDownClient(ClientPtr /*client */ );
-
 extern _X_EXPORT void UpdateCurrentTime(void);
 
 extern _X_EXPORT void UpdateCurrentTimeIf(void);
diff --git a/os/connection.c b/os/connection.c
index f7e10b3ba..05a5d4b79 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -97,6 +97,9 @@ SOFTWARE.
 #include <sys/uio.h>
 
 #endif                          /* WIN32 */
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"               /* for typedef of pointer */
 #include "osdep.h"
 #include "opaque.h"