normal	2015-06-05 09:18:30 +0900 (Fri, 05 Jun 2015)

  New Revision: 50780

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50780

  Log:
    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

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/ancdata.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50779)
+++ ChangeLog	(revision 50780)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Jun  5 09:17:45 2015  Eric Wong  <e@8...>
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): fix build error
+	  from r50776
+
 Fri Jun  5 07:05:58 2015  Eric Wong  <e@8...>
 
 	* io.c (sym_wait_readable, sym_wait_writable): declare
Index: ext/socket/ancdata.c
===================================================================
--- ext/socket/ancdata.c	(revision 50779)
+++ ext/socket/ancdata.c	(revision 50780)
@@ -1133,8 +1133,8 @@ bsock_sendmsg_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ext/socket/ancdata.c#L1133
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/