diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-05 00:18:30 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-05 00:18:30 +0000 |
| commit | 20dedbfd9d56a66aa97d4aca2ec0b732eaf7741f (patch) | |
| tree | de5cb7a3567d3d13eb2935dbf66f95c8427413e4 | |
| parent | cee9f4a4999c3421b40a48f67714609128a2987b (diff) | |
| download | ruby-20dedbfd9d56a66aa97d4aca2ec0b732eaf7741f.tar.gz | |
ext/socket/ancdata.c (bsock_sendmsg_internal): fix build error from r50776
Systems without HAVE_STRUCT_MSGHDR_MSG_CONTROL still need
controls to be nil for the check after argument parsing.
Note: not actually tested on a real system without msg_control
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/ancdata.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Jun 5 09:17:45 2015 Eric Wong <e@80x24.org> + + * ext/socket/ancdata.c (bsock_sendmsg_internal): fix build error + from r50776 + Fri Jun 5 07:05:58 2015 Eric Wong <e@80x24.org> * io.c (sym_wait_readable, sym_wait_writable): declare diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 277a1e87e2..ff17deb2b3 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1133,8 +1133,8 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) VALUE data, vflags, dest_sockaddr; struct msghdr mh; struct iovec iov; -#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) VALUE controls = Qnil; +#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) VALUE controls_str = 0; int family; #endif |