[前][次][番号順一覧][スレッド一覧]

ruby-changes:6639

From: usa <ko1@a...>
Date: Tue, 22 Jul 2008 16:09:50 +0900 (JST)
Subject: [ruby-changes:6639] Ruby:r18155 (trunk): * ext/socket/socket.c (connect_blocking, socks_connect_blocking,

usa	2008-07-22 16:09:34 +0900 (Tue, 22 Jul 2008)

  New Revision: 18155

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18155

  Log:
    * ext/socket/socket.c (connect_blocking, socks_connect_blocking,
      ruby_connect): cast.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/socket.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18154)
+++ ChangeLog	(revision 18155)
@@ -1,3 +1,8 @@
+Tue Jul 22 16:08:58 2008  NAKAMURA Usaku  <usa@r...>
+
+	* ext/socket/socket.c (connect_blocking, socks_connect_blocking,
+	  ruby_connect): cast.
+
 Tue Jul 22 11:05:08 2008  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* test/ruby/test_dir.rb: use realpath of tmpdir. [ruby-dev:35481]
Index: ext/socket/socket.c
===================================================================
--- ext/socket/socket.c	(revision 18154)
+++ ext/socket/socket.c	(revision 18155)
@@ -1146,7 +1146,7 @@
 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 @@
 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 @@
     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:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]