diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-05 16:40:36 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-05 16:40:36 +0000 |
| commit | fbb29bc08c76c00b963e5587e8e9e4b7c580ea95 (patch) | |
| tree | 5d9e3fac8791006562f424171f45e22861da1a04 | |
| parent | 07636ed42ebc9b690846813b492d75bcf32bb62c (diff) | |
| download | ruby-fbb29bc08c76c00b963e5587e8e9e4b7c580ea95.tar.gz | |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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) |