From edcd5bc0b313bafc61a54c2a0a6845fe39f6de55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Walld=C3=A9n?= <jonasw@roxen.com>
Date: Fri, 3 Oct 2014 18:17:30 +0200
Subject: [PATCH] Fix compile errors in emulated accept4() added in 236e8efea9.
---
src/fd_control.c | 2 +-
src/fd_control.h | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/fd_control.c b/src/fd_control.c
index 2e9295657f..14c014daa5 100644
--- a/src/fd_control.c
+++ b/src/fd_control.c
@@ -227,7 +227,7 @@ PMOD_EXPORT int set_close_on_exec(int fd, int which)
#ifndef HAVE_ACCEPT4
int accept4(int fd, struct sockaddr *addr, ACCEPT_SIZE_T *addrlen, int flags)
{
- int fd = fd_accept(fd, addr, addrlen);
+ fd = fd_accept(fd, addr, addrlen);
if (!flags || (fd < 0)) return fd;
if (((flags & SOCK_NONBLOCK) && (set_nonblocking(fd, 1) < 0)) ||
((flags & SOCK_CLOEXEC) && (set_close_on_exec(fd, 1) < 0))) {
diff --git a/src/fd_control.h b/src/fd_control.h
index f1f0d35830..1853722648 100644
--- a/src/fd_control.h
+++ b/src/fd_control.h
@@ -8,6 +8,10 @@
#define FD_CONTROL_H
#ifndef HAVE_ACCEPT4
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
/* NB: The default values are compatible with Linux,
* but should work on other OSs as well, since
* accept4(2) is emulated by us anyway.
@@ -44,7 +48,7 @@ void do_close_on_exec(void);
void cleanup_close_on_exec(void);
#endif /* HAVE_BROKEN_F_SETFD */
#ifndef HAVE_ACCEPT4
-int accept4(int fd, struct sockaddr *addr, ACCEPT_SIZE_T *addrlen, int flags)
+int accept4(int fd, struct sockaddr *addr, ACCEPT_SIZE_T *addrlen, int flags);
#endif /* !HAVE_ACCEPT4 */
/* Prototypes end here */
--
GitLab