diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-22 07:09:34 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-22 07:09:34 +0000 |
| commit | f00a72d3662b1553c0463d234238b8526fdedf66 (patch) | |
| tree | d6541815afa5bc85437cac971323f780217c7e04 | |
| parent | b893552d2361818c418323aaff2b8a9c582287a7 (diff) | |
| download | ruby-f00a72d3662b1553c0463d234238b8526fdedf66.tar.gz ruby-f00a72d3662b1553c0463d234238b8526fdedf66.tar.xz ruby-f00a72d3662b1553c0463d234238b8526fdedf66.zip | |
* ext/socket/socket.c (connect_blocking, socks_connect_blocking,
ruby_connect): cast.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/socket.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Jul 22 16:08:58 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/socket/socket.c (connect_blocking, socks_connect_blocking, + ruby_connect): cast. + Tue Jul 22 11:05:08 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * 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 67573a663..81c5a8e17 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: |