kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.

Browse source 
* ext/socket/socket.c (thread_read_select): restored.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2003-10-06 11:11:07 +00:00
parent 2a07445e0b
commit 26d111540e
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Oct 5 23:27:09 2003 Tanaka Akira <akr@m17n.org>
* ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.
* ext/socket/socket.c (thread_read_select): restored.
Mon Oct 6 16:23:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Oct 6 16:23:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (w_object): wrong method name in the message. * marshal.c (w_object): wrong method name in the message.

2
ext/socket/extconf.rb
View file

@ -194,7 +194,7 @@ end
have_header("netinet/tcp.h") if not /cygwin/ =~ RUBY_PLATFORM # for cygwin 1.1.5 have_header("netinet/tcp.h") if not /cygwin/ =~ RUBY_PLATFORM # for cygwin 1.1.5
have_header("netinet/udp.h") have_header("netinet/udp.h")
if have_func("sendmsg") or have_func("recvmsg") if have_func("sendmsg") | have_func("recvmsg")
have_struct_member('struct msghdr', 'msg_control', header=['sys/types.h', 'sys/socket.h']) have_struct_member('struct msghdr', 'msg_control', header=['sys/types.h', 'sys/socket.h'])
have_struct_member('struct msghdr', 'msg_accrights', header=['sys/types.h', 'sys/socket.h']) have_struct_member('struct msghdr', 'msg_accrights', header=['sys/types.h', 'sys/socket.h'])
end end

13
ext/socket/socket.c
View file

@ -1502,6 +1502,19 @@ unix_send_io(sock, val)
#endif #endif
} }
#if defined(HAVE_RECVMSG) && (defined(HAVE_ST_MSG_CONTROL) || defined(HAVE_ST_MSG_ACCRIGHTS))
static void
thread_read_select(fd)
int fd;
{
fd_set fds;
FD_ZERO(&fds);
FD_SET(fd, &fds);
rb_thread_select(fd+1, &fds, 0, 0, 0);
}
#endif
static VALUE static VALUE
unix_recv_io(argc, argv, sock) unix_recv_io(argc, argv, sock)
int argc; int argc;