зеркало из https://github.com/github/ruby.git
* ext/socket/ancdata.c (bsock_sendmsg_internal) [OpenBSD]: don't remove
the last padding to prevent sendmsg failure in test_udp_server in test/socket/test_socket.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
112b228273
Коммит
351f54de45
|
@ -1,3 +1,9 @@
|
||||||
|
Mon Feb 16 23:14:51 2009 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
|
* ext/socket/ancdata.c (bsock_sendmsg_internal) [OpenBSD]: don't remove
|
||||||
|
the last padding to prevent sendmsg failure in test_udp_server in
|
||||||
|
test/socket/test_socket.rb.
|
||||||
|
|
||||||
Mon Feb 16 21:59:32 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
|
Mon Feb 16 21:59:32 2009 Alexander Zavorine <alexandre.zavorine@nokia.com>
|
||||||
|
|
||||||
* symbian/setup: Update Symbian config to match recent changes in missing/alloca.c
|
* symbian/setup: Update Symbian config to match recent changes in missing/alloca.c
|
||||||
|
|
|
@ -927,9 +927,11 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
|
||||||
MEMCPY(CMSG_DATA(cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata));
|
MEMCPY(CMSG_DATA(cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata));
|
||||||
last_pad = cspace - cmh->cmsg_len;
|
last_pad = cspace - cmh->cmsg_len;
|
||||||
}
|
}
|
||||||
|
#if !defined(__OpenBSD__)
|
||||||
if (last_pad) {
|
if (last_pad) {
|
||||||
rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad);
|
rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented");
|
rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented");
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче