xserver: Branch 'master'

[GitLab Mirror]

 dix/dix_priv.h |    4 ++++
 dix/dixutils.c |    3 +++
 dix/main.c     |    1 +
 include/dix.h  |    6 ------
 os/WaitFor.c   |    4 +++-
 5 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit b1ce5543f1ef4e33c5ef00bd62c892a55417ab33
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 7 14:50:51 2024 +0100

    dix: unexport workqueue functions
    
    These aren't used by drivers, so no need to export them.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1376>

diff --git a/dix/dix_priv.h b/dix/dix_priv.h
index c21043594..0fae86405 100644
--- a/dix/dix_priv.h
+++ b/dix/dix_priv.h
@@ -15,4 +15,8 @@
 #define MAX_BIG_REQUEST_SIZE 4194303
 extern long maxBigRequestSize;
 
+void ClearWorkQueue(void);
+void ProcessWorkQueue(void);
+void ProcessWorkQueueZombies(void);
+
 #endif /* _XSERVER_DIX_PRIV_H */
diff --git a/dix/dixutils.c b/dix/dixutils.c
index a11c82e9f..5ae548b9d 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -86,6 +86,9 @@ Author:  Adobe Systems Incorporated
 
 #include <X11/X.h>
 #include <X11/Xmd.h>
+
+#include "dix/dix_priv.h"
+
 #include "misc.h"
 #include "windowstr.h"
 #include "dixstruct.h"
diff --git a/dix/main.c b/dix/main.c
index 637f98b0c..4ecb8955e 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -83,6 +83,7 @@ Equipment Corporation.
 #include <X11/Xproto.h>
 #include <pixman.h>
 
+#include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
 
 #include "scrnintstr.h"
diff --git a/include/dix.h b/include/dix.h
index 576c0fc0f..85c97dd03 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -259,12 +259,6 @@ extern _X_EXPORT void RemoveBlockAndWakeupHandlers(ServerBlockHandlerProcPtr blo
 
 extern _X_EXPORT void InitBlockAndWakeupHandlers(void);
 
-extern _X_EXPORT void ClearWorkQueue(void);
-
-extern _X_EXPORT void ProcessWorkQueue(void);
-
-extern _X_EXPORT void ProcessWorkQueueZombies(void);
-
 extern _X_EXPORT Bool QueueWorkProc(Bool (*function)(ClientPtr clientUnused,
                                                      void *closure),
                                     ClientPtr client,
diff --git a/os/WaitFor.c b/os/WaitFor.c
index f34964f2e..c27be11fd 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -63,8 +63,10 @@ SOFTWARE.
 #include <errno.h>
 #include <stdio.h>
 #include <X11/X.h>
-#include "misc.h"
 
+#include "dix/dix_priv.h"
+
+#include "misc.h"
 #include "osdep.h"
 #include "dixstruct.h"
 #include "opaque.h"