diff options
| author | Pekka Paalanen <ppaalanen@gmail.com> | 2012-05-30 15:53:43 +0300 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-05-31 13:53:51 -0400 |
| commit | 647f2bfd2a9214e5bebb2290252d013ccbbb290c (patch) | |
| tree | 7a3e771586b5dc8098ab6d4fccec49e5bbae0a1e | |
| parent | 200019c0c66ec757353ffaaea8d9c98da37f26c8 (diff) | |
window: add wrapper for EPOLL_CLOEXEC
Android does not have EPOLL_CLOEXEC, so add a fallback.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
| -rw-r--r-- | clients/window.c | 3 | ||||
| -rw-r--r-- | shared/os-compatibility.c | 17 | ||||
| -rw-r--r-- | shared/os-compatibility.h | 3 |
3 files changed, 22 insertions, 1 deletions
diff --git a/clients/window.c b/clients/window.c index 3ef648e..ae8792e 100644 --- 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 --- 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 --- 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 */ |