window: add wrapper for EPOLL_CLOEXEC

Android does not have EPOLL_CLOEXEC, so add a fallback.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>

diff --git a/clients/window.c b/clients/window.c
index 3ef648e..ae8792e 100644 (file)
--- a/clients/window.c
+++ b/clients/window.c
@@ -62,6 +62,7 @@
 #include <wayland-client.h>
 #include "../shared/cairo-util.h"
 #include "text-cursor-position-client-protocol.h"
+#include "../shared/os-compatibility.h"
 
 #include "window.h"
 
@@ -3299,7 +3300,7 @@ display_create(int argc, char *argv[])
                return NULL;
        }
 
-       d->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
+       d->epoll_fd = os_epoll_create_cloexec();
        d->display_fd = wl_display_get_fd(d->display, event_mask_update, d);
        d->display_task.run = handle_display_data;
        display_watch_fd(d, d->display_fd, EPOLLIN, &d->display_task);

diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c
index b79aa1f..3c065e8 100644 (file)
--- a/shared/os-compatibility.c
+++ b/shared/os-compatibility.c
@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/epoll.h>
 
 #include "os-compatibility.h"
 
@@ -76,3 +77,19 @@ os_socketpair_cloexec(int domain, int type, int protocol, int *sv)
        return -1;
 }
 
+int
+os_epoll_create_cloexec(void)
+{
+       int fd;
+
+#ifdef EPOLL_CLOEXEC
+       fd = epoll_create1(EPOLL_CLOEXEC);
+       if (fd >= 0)
+               return fd;
+       if (errno != EINVAL)
+               return -1;
+#endif
+
+       fd = epoll_create(1);
+       return set_cloexec_or_close(fd);
+}

diff --git a/shared/os-compatibility.h b/shared/os-compatibility.h
index ca753b6..6ada7b6 100644 (file)
--- a/shared/os-compatibility.h
+++ b/shared/os-compatibility.h
@@ -36,4 +36,7 @@ backtrace(void **buffer, int size)
 int
 os_socketpair_cloexec(int domain, int type, int protocol, int *sv);
 
+int
+os_epoll_create_cloexec(void);
+
 #endif /* OS_COMPATIBILITY_H */