xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xwayland/xwayland-shm.c |    2 ++
 include/os.h               |    3 ---
 miext/sync/misyncshm.c     |   11 +++++++----
 os/osdep.h                 |    5 +++++
 4 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 15d3c1a6f1266c139f56f7c674c8f39a8227328b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 22 14:58:41 2024 +0100

    os: move os_move_fd() out of public API
    
    This function isn't used by any driver and doesn't seem to be useful for them,
    thus move it out of the public module API, in order to tidy it up a bit.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1366>

diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
index 65c88ead5..faca5224e 100644
--- a/hw/xwayland/xwayland-shm.c
+++ b/hw/xwayland/xwayland-shm.c
@@ -36,6 +36,8 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "os/osdep.h"
+
 #include "fb.h"
 #include "pixmapstr.h"
 
diff --git a/include/os.h b/include/os.h
index ac5c9ee9d..84770c535 100644
--- a/include/os.h
+++ b/include/os.h
@@ -697,9 +697,6 @@ LogPrintMarkers(void);
 extern _X_EXPORT void
 xorg_backtrace(void);
 
-extern _X_EXPORT int
-os_move_fd(int fd);
-
 #include <signal.h>
 
 #if defined(WIN32) && !defined(__CYGWIN__)
diff --git a/miext/sync/misyncshm.c b/miext/sync/misyncshm.c
index e894e5894..1e8865e89 100644
--- a/miext/sync/misyncshm.c
+++ b/miext/sync/misyncshm.c
@@ -24,16 +24,19 @@
 #include <dix-config.h>
 #endif
 
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <X11/xshmfence.h>
+
+#include "os/osdep.h"
+
 #include "scrnintstr.h"
 #include "misync_priv.h"
 #include "misyncstr.h"
 #include "misyncshm.h"
 #include "misyncfd.h"
 #include "pixmapstr.h"
-#include <sys/mman.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <X11/xshmfence.h>
 
 static DevPrivateKeyRec syncShmFencePrivateKey;
 
diff --git a/os/osdep.h b/os/osdep.h
index ede9eb889..59e6c5e95 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -148,4 +148,7 @@ static inline void uname(struct utsname *uts) {
 
 void AutoResetServer(int sig);
 
+/* clone fd so it gets out of our select mask */
+int os_move_fd(int fd);
+
 #endif                          /* _OSDEP_H_ */
commit 1bdbe1cb3f7ed3600009fb9d436c3f749eb3ec1a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 6 19:52:24 2024 +0100

    os: fix missing X11/Xdefs.h include in os/osdep.h
    
    osdep.h needs Bool type, which is defined X11/Xdefs.h.
    For now it works, since Xdefs usually is already included somewhere
    else, but that's an unreliable programming styles which quickly hits
    us when changing include order.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1366>

diff --git a/os/osdep.h b/os/osdep.h
index 04d0a827b..ede9eb889 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -51,6 +51,8 @@ SOFTWARE.
 #ifndef _OSDEP_H_
 #define _OSDEP_H_ 1
 
+#include <X11/Xdefs.h>
+
 #if defined(XDMCP) || defined(HASXDMAUTH)
 #include <X11/Xdmcp.h>
 #endif