xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/shared/sigio.c |    2 ++
 include/os.h                         |    3 ---
 os/osdep.h                           |    4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3b7a63e6ae5c59127bab1ff10acb51003ced0b53
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 22 16:13:06 2024 +0100

    os: unexport xthread_sigmask
    
    This function isn't used by drivers and there's currently no need to do so,
    thus keep it out of the public module API.
    
    Fixes: 30ac7567980a1eb79d084a63e0e74e1d9a3af673
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1368>

diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
index e3f0774dc..be78b9eaa 100644
--- a/hw/xfree86/os-support/shared/sigio.c
+++ b/hw/xfree86/os-support/shared/sigio.c
@@ -59,6 +59,8 @@
 #include <errno.h>
 #include <X11/X.h>
 
+#include "os/osdep.h"
+
 #include <xserver_poll.h>
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/include/os.h b/include/os.h
index 709f3e02c..848330760 100644
--- a/include/os.h
+++ b/include/os.h
@@ -510,7 +510,4 @@ xorg_backtrace(void);
 typedef _sigset_t sigset_t;
 #endif
 
-extern _X_EXPORT int
-xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest);
-
 #endif                          /* OS_H */
diff --git a/os/osdep.h b/os/osdep.h
index 705416de3..b6120eef2 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -166,4 +166,8 @@ void AutoResetServer(int sig);
 /* clone fd so it gets out of our select mask */
 int os_move_fd(int fd);
 
+/* set signal mask - either on current thread or whole process,
+   depending on whether multithreading is used */
+int xthread_sigmask(int how, const sigset_t *set, sigset_t *oldest);
+
 #endif                          /* _OSDEP_H_ */