diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/socket/init.c | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Apr 6 01:21:56 2013 Tanaka Akira <akr@fsij.org> + + * ext/socket/init.c (cloexec_accept): Fix a compile error on + Debian GNU/kFreeBSD. Consider HAVE_ACCEPT4 is defined + but SOCK_CLOEXEC is not defined. + Sat Apr 6 00:19:30 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com> * load.c (features_index_add): use rb_str_subseq() to specify C string diff --git a/ext/socket/init.c b/ext/socket/init.c index 44228d3463..33ddc05fa4 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -497,7 +497,11 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len) if (address_len) len0 = *address_len; #ifdef HAVE_ACCEPT4 if (try_accept4) { - ret = accept4(socket, address, address_len, SOCK_CLOEXEC); + int flags = 0; +#ifdef SOCK_CLOEXEC + flags |= SOCK_CLOEXEC; +#endif + ret = accept4(socket, address, address_len, flags); /* accept4 is available since Linux 2.6.28, glibc 2.10. */ if (ret != -1) { if (ret <= 2) |