summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-05 16:40:36 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-05 16:40:36 +0000
commitfbb29bc08c76c00b963e5587e8e9e4b7c580ea95 (patch)
tree5d9e3fac8791006562f424171f45e22861da1a04 /ext
parent07636ed42ebc9b690846813b492d75bcf32bb62c (diff)
* 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
Diffstat (limited to 'ext')
-rw-r--r--ext/socket/init.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 44228d3..33ddc05 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)