xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit c17c527b9ad4935303c2f1cadae740640b3443ba
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 22 15:40:50 2024 +0100

    os: unexport ForceClockId()
    
    This function is only intended for DDX'es (currently just Xwayland) that
    need to force using another clock. Really shouldn't be called by drivers
    or extensions.
    
    Fixes: a779fda224bee0c4d27636503367e55ae93b33c2
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1333>

diff --git a/include/os.h b/include/os.h
index e78f5a4c1..a07aedf1a 100644
--- a/include/os.h
+++ b/include/os.h
@@ -155,10 +155,6 @@ extern _X_EXPORT void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
 
 extern _X_EXPORT Bool AddClientOnOpenFD(int /* fd */ );
 
-#ifdef MONOTONIC_CLOCK
-extern void ForceClockId(clockid_t /* forced_clockid */);
-#endif
-
 extern _X_EXPORT CARD32 GetTimeInMillis(void);
 extern _X_EXPORT CARD64 GetTimeInMicros(void);
 
diff --git a/os/osdep.h b/os/osdep.h
index 138a04fcd..0687f568d 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -195,4 +195,7 @@ int OnlyListenToOneClient(ClientPtr client);
 
 void ListenToAllClients(void);
 
+/* allow DDX to force using another clock */
+void ForceClockId(clockid_t forced_clockid);
+
 #endif                          /* _OSDEP_H_ */