xserver: Branch 'master'

[GitLab Mirror]

 Xext/xtest.c |    1 +
 include/os.h |    4 ----
 os/osdep.h   |    3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4c1795701cb07ed9fe0e6b2a2a62a2e210be2dfb
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Mar 11 18:57:12 2024 +0100

    os: unexport MakeClientGrabPervious() and MakeClientGrabImpervious()
    
    Not used by any 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/1384>

diff --git a/Xext/xtest.c b/Xext/xtest.c
index fe2847bb1..96f898656 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -38,6 +38,7 @@
 #include <X11/extensions/XIproto.h>
 
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "os.h"
diff --git a/include/os.h b/include/os.h
index 396d4205a..92320d949 100644
--- a/include/os.h
+++ b/include/os.h
@@ -155,10 +155,6 @@ extern _X_EXPORT void IgnoreClient(ClientPtr /*client */ );
 
 extern _X_EXPORT void AttendClient(ClientPtr /*client */ );
 
-extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client */ );
-
-extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client */ );
-
 extern _X_EXPORT void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
 
 extern _X_EXPORT Bool AddClientOnOpenFD(int /* fd */ );
diff --git a/os/osdep.h b/os/osdep.h
index 7221d112f..318d2b61d 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -188,4 +188,7 @@ void OsReleaseSignals(void);
 void OsResetSignals(void);
 void OsAbort(void) _X_NORETURN;
 
+void MakeClientGrabPervious(ClientPtr client);
+void MakeClientGrabImpervious(ClientPtr client);
+
 #endif                          /* _OSDEP_H_ */