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
This commit is contained in:
normal 2015-06-05 00:18:30 +00:00
Родитель cee9f4a499
Коммит 20dedbfd9d
2 изменённых файлов: 6 добавлений и 1 удалений

Просмотреть файл

@ -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> Fri Jun 5 07:05:58 2015 Eric Wong <e@80x24.org>
* io.c (sym_wait_readable, sym_wait_writable): declare * io.c (sym_wait_readable, sym_wait_writable): declare

Просмотреть файл

@ -1133,8 +1133,8 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
VALUE data, vflags, dest_sockaddr; VALUE data, vflags, dest_sockaddr;
struct msghdr mh; struct msghdr mh;
struct iovec iov; struct iovec iov;
#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
VALUE controls = Qnil; VALUE controls = Qnil;
#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
VALUE controls_str = 0; VALUE controls_str = 0;
int family; int family;
#endif #endif