aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/ancdata.c2
2 files changed, 6 insertions, 1 deletions
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 <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