xserver: Branch 'master'

[GitLab Mirror]

 include/os.h |    2 --
 os/osdep.h   |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3d3d148039e852e3bd50e78caae3e40449b8ab73
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Mar 8 18:53:03 2024 +0100

    os: unexport WaitForSomething()
    
    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/1584>

diff --git a/include/os.h b/include/os.h
index 0c81818b0..50ee2f83f 100644
--- a/include/os.h
+++ b/include/os.h
@@ -86,8 +86,6 @@ typedef struct _NewClientRec *NewClientPtr;
 #include <stdio.h>
 #include <stdarg.h>
 
-extern _X_EXPORT Bool WaitForSomething(Bool clients_are_ready);
-
 extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client */ );
 
 extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
diff --git a/os/osdep.h b/os/osdep.h
index 321642585..fdcb083b9 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -200,6 +200,8 @@ void ListenToAllClients(void);
 /* allow DDX to force using another clock */
 void ForceClockId(clockid_t forced_clockid);
 
+Bool WaitForSomething(Bool clients_are_ready);
+
 extern int LimitClients;
 extern Bool PartialNetwork;
 extern Bool RunFromSigStopParent;