diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-09 07:31:14 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-09 07:31:14 +0000 |
| commit | f2016423a6e52b0b779265151b27361aeefedd54 (patch) | |
| tree | fa0b897ab0cef1c08ebed4a08c5def5a79d82e21 /ext | |
| parent | 7d7ed2c23116b8f2c0bfcd902eaf8a2a15301bb3 (diff) | |
merge revision(s) 50685: [Backport #11198]
* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile
[ruby-core:69419] [Feature #11198]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/ancdata.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 3a6d3e7b07..cb7fca413a 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1133,7 +1133,7 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) struct msghdr mh; struct iovec iov; #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) - volatile VALUE controls_str = 0; + VALUE controls_str = 0; VALUE *controls_ptr = NULL; int family; #endif @@ -1289,6 +1289,9 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) rb_readwrite_sys_fail(RB_IO_WAIT_WRITABLE, "sendmsg(2) would block"); rb_sys_fail("sendmsg(2)"); } +#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) + RB_GC_GUARD(controls_str); +#endif return SSIZET2NUM(ss); } |