aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 63e0e728fee..19c553ff7a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-10-10 Paul Eggert <eggert@cs.ucla.edu>
2
3 Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666).
4 * process.c (accept4) [!HAVE_ACCEPT4]: New macro.
5
12014-10-09 Stefan Monnier <monnier@iro.umontreal.ca> 62014-10-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * frame.c (Fmouse_pixel_position): Call Vmouse_position_function 8 * 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)
173 return fd; 173 return fd;
174} 174}
175 175
176# undef accept4
177# define accept4(sockfd, addr, addrlen, flags) \
178 process_accept4 (sockfd, addr, addrlen, flags)
176static int 179static int
177accept4 (int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags) 180accept4 (int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)
178{ 181{