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>

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"
 

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__)

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;
 

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_ */