xserver: Branch 'master'

[GitLab Mirror]

 dix/dix_priv.h             |    1 +
 include/dix.h              |    4 ----
 test/xi2/protocol-common.c |    3 +++
 test/xtest.c               |    3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit dfdde27990ce2b5c3543226b4ee12252bd34352a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 7 16:19:33 2024 +0100

    dix: unexport InitClient()
    
    Not used by any driver, 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/1379>

diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index d20373108..13f135e62 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -41,6 +41,7 @@ void ProcessWorkQueueZombies(void);
 
 void CloseDownClient(ClientPtr client);
 ClientPtr GetCurrentClient(void);
+void InitClient(ClientPtr client, int i, void *ospriv);
 
 /* lookup builtin color by name */
 Bool dixLookupBuiltinColor(int screen,
diff --git a/include/dix.h b/include/dix.h
index a50b2da1c..d98af9e6e 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -165,10 +165,6 @@ extern _X_EXPORT void UpdateCurrentTimeIf(void);
 extern _X_EXPORT int dixDestroyPixmap(void *value,
                                       XID pid);
 
-extern _X_EXPORT void InitClient(ClientPtr client,
-                                 int i,
-                                 void *ospriv);
-
 extern _X_EXPORT ClientPtr NextAvailableClient(void *ospriv);
 
 extern _X_EXPORT void SendErrorToClient(ClientPtr /*client */ ,
diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
index 219a6fd05..f193bce45 100644
--- a/test/xi2/protocol-common.c
+++ b/test/xi2/protocol-common.c
@@ -30,6 +30,9 @@
 
 #include <errno.h>
 #include <stdint.h>
+
+#include "dix/dix_priv.h"
+
 #include "extinit.h"            /* for XInputExtensionInit */
 #include "exglobals.h"
 #include "xkbsrv.h"             /* for XkbInitPrivates */
diff --git a/test/xtest.c b/test/xtest.c
index bfb066b7d..1d38f3d47 100644
--- a/test/xtest.c
+++ b/test/xtest.c
@@ -29,6 +29,9 @@
 #endif
 #include <stdint.h>
 #include <X11/Xatom.h>
+
+#include "dix/dix_priv.h"
+
 #include "input.h"
 #include "inputstr.h"
 #include "scrnintstr.h"