diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-31 12:49:16 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-31 12:49:16 +0000 |
commit | 1a70dfe6f4750a577b889a568527a07ed540d43c (patch) | |
tree | 11a9bd06f5fff7d9e3df7397f50f4ee1754ea9c6 /ext/socket/init.c | |
parent | 6533f070ba616662b7ab7504f7bc2a0827394a89 (diff) | |
download | ruby-1a70dfe6f4750a577b889a568527a07ed540d43c.tar.gz |
* include/ruby/intern.h (rb_fd_fix_cloexec): renamed from
rb_fd_set_cloexec.
* io.c: follow the above renaming.
* ext/pty/pty.c: ditto.
* ext/socket/init.c: ditto.
* ext/socket/socket.c: ditto.
* ext/socket/ancdata.c: ditto.
* ext/socket/unixsocket.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/init.c')
-rw-r--r-- | ext/socket/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/socket/init.c b/ext/socket/init.c index ca271f3b5a..70c92d7452 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -252,7 +252,7 @@ rsock_socket(int domain, int type, int proto) } } if (0 <= fd) - rb_fd_set_cloexec(fd); + rb_fd_fix_cloexec(fd); return fd; } @@ -466,7 +466,7 @@ rsock_s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, s } rb_sys_fail("accept(2)"); } - rb_fd_set_cloexec(fd2); + rb_fd_fix_cloexec(fd2); make_fd_nonblock(fd2); return rsock_init_sock(rb_obj_alloc(klass), fd2); } @@ -513,7 +513,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len) } rb_sys_fail(0); } - rb_fd_set_cloexec(fd2); + rb_fd_fix_cloexec(fd2); if (!klass) return INT2NUM(fd2); return rsock_init_sock(rb_obj_alloc(klass), fd2); } |