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 #include +#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 #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 #endif +#include +#include +#include +#include + +#include "os/osdep.h" + #include "scrnintstr.h" #include "misync_priv.h" #include "misyncstr.h" #include "misyncshm.h" #include "misyncfd.h" #include "pixmapstr.h" -#include -#include -#include -#include 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_ */