From 78a2ccdffa46505347324e0593b0b07ec03907cb Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Sun, 6 Jul 2014 09:12:28 +0300 Subject: [PATCH] stropts.h doesn't exist on several platforms (Bug 10237) stropts.h was included to provide the ioctl function which is better supported by including sys/ioctl.h, this patch switches over to using it. --- configure.ac.in | 2 ++ src/compositor.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 5a347a1..7ffd334 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -90,6 +90,8 @@ XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [wnck_minimum_version]) XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0]) XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.72]) +AC_CHECK_HEADERS([sys/ioctl.h]) + dnl dnl Sync to vblank support dnl diff --git a/src/compositor.c b/src/compositor.c index 843ce65..3134494 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -41,7 +41,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +#include +#endif /* HAVE_SYS_IOCTL_H */ #endif /* HAVE_LIBDRM */ #include "display.h" @@ -1297,7 +1299,9 @@ wait_vblank (ScreenInfo *screen_info) do { +#ifdef HAVE_SYS_IOCTL_H retval = ioctl (screen_info->dri_fd, DRM_IOCTL_WAIT_VBLANK, &vblank); +#endif HAVE_SYS_IOCTL_H vblank.request.type &= ~_DRM_VBLANK_RELATIVE; } while (retval == -1 && errno == EINTR); -- 2.0.0