From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 10 Oct 2014 18:02:09 +0000 (-0700)
Subject: Fix port to Debian GNU/kFreeBSD 7 (wheezy).
X-Git-Tag: emacs-24.4-rc1~22
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=390c2f3bcc494fa07752f59b42605afc9971111c;p=emacs.git

Fix port to Debian GNU/kFreeBSD 7 (wheezy).

* process.c (accept4) [!HAVE_ACCEPT4]: New macro.

Fixes: debbugs:18666
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 63e0e728fee..19c553ff7a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666).
+	* process.c (accept4) [!HAVE_ACCEPT4]: New macro.
+
 2014-10-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* frame.c (Fmouse_pixel_position): Call Vmouse_position_function
diff --git a/src/process.c b/src/process.c
index 2c66b9e976e..178fba8887e 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)
 {