From e4d911fa98c598774408051ac984d8c67accf62f Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 22 Jul 2008 07:09:34 +0000 Subject: [PATCH] * ext/socket/socket.c (connect_blocking, socks_connect_blocking, ruby_connect): cast. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/socket/socket.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87881c3d62..60ccdce509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 22 16:08:58 2008 NAKAMURA Usaku + + * ext/socket/socket.c (connect_blocking, socks_connect_blocking, + ruby_connect): cast. + Tue Jul 22 11:05:08 2008 Kazuhiro NISHIYAMA * test/ruby/test_dir.rb: use realpath of tmpdir. [ruby-dev:35481] diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 67573a663a..81c5a8e170 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1146,7 +1146,7 @@ static VALUE connect_blocking(void *data) { struct connect_arg *arg = data; - return connect(arg->fd, arg->sockaddr, arg->len); + return (VALUE)connect(arg->fd, arg->sockaddr, arg->len); } #if defined(SOCKS) && !defined(SOCKS5) @@ -1154,7 +1154,7 @@ static VALUE socks_connect_blocking(void *data) { struct connect_arg *arg = data; - return Rconnect(arg->fd, arg->sockaddr, arg->len); + return (VALUE)Rconnect(arg->fd, arg->sockaddr, arg->len); } #endif @@ -1177,7 +1177,7 @@ ruby_connect(int fd, const struct sockaddr *sockaddr, int len, int socks) if (socks) func = socks_connect_blocking; #endif for (;;) { - status = BLOCKING_REGION(func, &arg); + status = (int)BLOCKING_REGION(func, &arg); if (status < 0) { switch (errno) { case EAGAIN: