os: move xserver_poll.h into os/ directory

This header isn't public and holds defines for code in os/ directory,
so no need to keep it in the global header dir - it's probably better
off in os/ directory - just like we already have with many others.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1389>

hw/xfree86/drivers/modesetting/pageflip.c

@@ -26,7 +26,8 @@
 
 #include <errno.h>
 
-#include <xserver_poll.h>
+#include "os/xserver_poll.h"
+
 #include <xf86drm.h>
 
 #include "driver.h"

hw/xfree86/os-support/shared/posix_tty.c

@@ -59,7 +59,8 @@
 #include <errno.h>
 #include <X11/X.h>
 
-#include <xserver_poll.h>
+#include "os/xserver_poll.h"
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"

hw/xfree86/os-support/shared/sigio.c

@@ -61,8 +61,8 @@
 #include <X11/X.h>
 
 #include "os/osdep.h"
+#include "os/xserver_poll.h"
 
-#include <xserver_poll.h>
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_os_support.h"

hw/xfree86/os-support/solaris/sun_bell.c

@@ -29,7 +29,8 @@
 #include <sys/uio.h>
 #include <limits.h>
 #include <math.h>
-#include <xserver_poll.h>
+
+#include "os/xserver_poll.h"
 
 #include "xf86.h"
 #include "xf86Priv.h"

hw/xwayland/xwayland-screen.c

@@ -37,6 +37,7 @@
 #include <X11/Xatom.h>
 
 #include "os/osdep.h"
+#include "os/xserver_poll.h"
 
 #include <micmap.h>
 #include <misyncshm.h>
@@ -46,7 +47,6 @@
 #include <propertyst.h>
 #include <inputstr.h>
 #include <xacestr.h>
-#include <xserver_poll.h>
 
 #include "xwayland-cursor.h"
 #include "xwayland-screen.h"

hw/xwayland/xwayland.c

@@ -39,6 +39,7 @@
 #include "os/cmdline.h"
 #include "os/ddx_priv.h"
 #include "os/osdep.h"
+#include "os/xserver_poll.h"
 
 #include <selection.h>
 #include <micmap.h>
@@ -48,7 +49,6 @@
 #include <glx_extinit.h>
 #include <opaque.h>
 #include <os.h>
-#include <xserver_poll.h>
 #include <propertyst.h>
 #include <version-config.h>
 

os/ospoll.c

@@ -24,10 +24,13 @@
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
+
+#include "os/xserver_poll.h"
+
 #include "misc.h"               /* for typedef of pointer */
 #include "ospoll.h"
 #include "list.h"

os/xserver_poll.c

@@ -82,12 +82,13 @@
 #include <sys/time.h>                        /* time definitions */
 #include <assert.h>                          /* assertion macros */
 #include <string.h>                          /* string functions */
-#include "xserver_poll.h"
 
 #if defined(WIN32) && !defined(__CYGWIN__)
 #include <X11/Xwinsock.h>
 #endif
 
+#include "os/xserver_poll.h"
+
 /*---------------------------------------------------------------------------*\
 				  Macros
 \*---------------------------------------------------------------------------*/