summaryrefslogtreecommitdiff
path: root/hw/dmx
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-07-18 15:58:42 -0700
committerAdam Jackson <ajax@redhat.com>2016-07-21 15:04:36 -0400
commitd403aca70a07e1401cb93738f1af5961582a2e47 (patch)
tree76cc3083a096b248f4bda0477be04d9cb0b8f2ed /hw/dmx
parent711c36558f50943c8342f25ad210281134887a3d (diff)
Switch poll() users to xserver_poll()
This uses the wrapper in case we need to emulate poll with select as we do on Windows. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw/dmx')
-rw-r--r--hw/dmx/input/lnx-ms.c4
-rw-r--r--hw/dmx/input/lnx-ps2.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/dmx/input/lnx-ms.c b/hw/dmx/input/lnx-ms.c
index c7a09cab7..1a5786c7e 100644
--- a/hw/dmx/input/lnx-ms.c
+++ b/hw/dmx/input/lnx-ms.c
@@ -76,7 +76,7 @@
#include <X11/Xos.h>
#include <errno.h>
#include <termios.h>
-#include <poll.h>
+#include <xserver_poll.h>
/*****************************************************************************/
/* Define some macros to make it easier to move this file to another
@@ -135,7 +135,7 @@ msLinuxReadBytes(int fd, unsigned char *buf, int len, int min)
}
if (tot % min == 0)
break;
- n = poll(&poll_fd, 1, 100);
+ n = xserver_poll(&poll_fd, 1, 100);
if (n <= 0)
break;
}
diff --git a/hw/dmx/input/lnx-ps2.c b/hw/dmx/input/lnx-ps2.c
index 00ccc014e..2b6e8d63b 100644
--- a/hw/dmx/input/lnx-ps2.c
+++ b/hw/dmx/input/lnx-ps2.c
@@ -73,7 +73,7 @@
#include <X11/Xos.h>
#include <errno.h>
#include <termios.h>
-#include <poll.h>
+#include <xserver_poll.h>
/*****************************************************************************/
/* Define some macros to make it easier to move this file to another
@@ -131,7 +131,7 @@ ps2LinuxReadBytes(int fd, unsigned char *buf, int len, int min)
}
if (tot % min == 0)
break;
- n = poll(&poll_fd, 1, 100);
+ n = xserver_poll(&poll_fd, 1, 100);
if (n <= 0)
break;
}