From 20dedbfd9d56a66aa97d4aca2ec0b732eaf7741f Mon Sep 17 00:00:00 2001 From: normal Date: Fri, 5 Jun 2015 00:18:30 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ ext/socket/ancdata.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 22143c3bfe..338da25b04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 5 09:17:45 2015 Eric Wong + + * ext/socket/ancdata.c (bsock_sendmsg_internal): fix build error + from r50776 + Fri Jun 5 07:05:58 2015 Eric Wong * 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