[PATCH RFC wayland 2/4] os-compatibility: Require accept4

Daniel Stone daniels at collabora.com
Tue Nov 29 16:59:41 UTC 2016


We already require timerfd and signalfd, so accept4 is no burden here.
This was originally introduced to help porting to FreeBSD, but that
seems to be a lost cause.

Signed-off-by: Daniel Stone <daniels at collabora.com>
---
 src/wayland-os.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/wayland-os.c b/src/wayland-os.c
index 93b6f5f..f3631e6 100644
--- a/src/wayland-os.c
+++ b/src/wayland-os.c
@@ -154,13 +154,11 @@ wl_os_accept_cloexec(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 {
 	int fd;
 
-#ifdef HAVE_ACCEPT4
 	fd = accept4(sockfd, addr, addrlen, SOCK_CLOEXEC);
 	if (fd >= 0)
 		return fd;
 	if (errno != ENOSYS)
 		return -1;
-#endif
 
 	fd = accept(sockfd, addr, addrlen);
 	return set_cloexec_or_close(fd);
-- 
2.9.3



More information about the wayland-devel mailing list