Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org

1 files changed, 3 insertions, 0 deletions

diff --git a/src/process.c b/src/process.c
index 0c36f8e18c3..06fc918cf54 100644
--- a/src/process.c
+++ b/src/process.c
@@ -173,6 +173,9 @@ close_on_exec (int fd)
   return fd;
 }
 
+# undef accept4
+# define accept4(sockfd, addr, addrlen, flags) \
+    process_accept4 (sockfd, addr, addrlen, flags)
 static int
 accept4 (int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)
 {