From bb0c68997a7a3e6e33dfc19818228872582b3613 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 22 Feb 2024 14:58:41 +0100
Subject: [PATCH] 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@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1366>
(cherry picked from commit 15d3c1a6f1266c139f56f7c674c8f39a8227328b)
---
 hw/xwayland/xwayland-shm.c |  2 ++
 include/os.h               |  3 ---
 miext/sync/misyncshm.c     | 11 +++++++----
 os/osdep.h                 |  3 +++
 4 files changed, 12 insertions(+), 7 deletions(-)

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 451750fe3..d93e7fe7d 100644
--- a/include/os.h
+++ b/include/os.h
@@ -708,9 +708,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 27bf07db1..3ecb0a878 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.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 bc89576ba..26d430bf1 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -221,4 +221,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_ */