akr	2009-01-27 20:07:41 +0900 (Tue, 27 Jan 2009)

  New Revision: 21804

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

  Log:
    * ext/socket/init.c (socks_connect_blocking): moved from
      sockssocket.c.  [ruby-dev:37834]
    * sockssocket.c (socks_init): don't omit "int" type.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21803)
+++ ChangeLog	(revision 21804)
@@ -1,3 +1,10 @@
+Tue Jan 27 20:02:07 2009  Tanaka Akira  <akr@f...>
+
+	* ext/socket/init.c (socks_connect_blocking): moved from
+	  sockssocket.c.  [ruby-dev:37834]
+
+	* sockssocket.c (socks_init): don't omit "int" type.
+
 Tue Jan 27 14:41:33 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* cygwin/GNUmakefile.in (RUBYDEF): needs DATA marks to export
Index: ext/socket/init.c
===================================================================
--- ext/socket/init.c	(revision 21803)
+++ ext/socket/init.c	(revision 21804)
@@ -333,6 +333,15 @@
     return (VALUE)connect(arg->fd, arg->sockaddr, arg->len);
 }
 
+#if defined(SOCKS) && !defined(SOCKS5)
+static VALUE
+socks_connect_blocking(void *data)
+{
+    struct connect_arg *arg = data;
+    return (VALUE)Rconnect(arg->fd, arg->sockaddr, arg->len);
+}
+#endif
+
 int
 ruby_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
 {
Index: ext/socket/sockssocket.c
===================================================================
--- ext/socket/sockssocket.c	(revision 21803)
+++ ext/socket/sockssocket.c	(revision 21804)
@@ -10,20 +10,11 @@
 
 #include "rubysocket.h"
 
-#if defined(SOCKS) && !defined(SOCKS5)
-static VALUE
-socks_connect_blocking(void *data)
-{
-    struct connect_arg *arg = data;
-    return (VALUE)Rconnect(arg->fd, arg->sockaddr, arg->len);
-}
-#endif
-
 #ifdef SOCKS
 static VALUE
 socks_init(VALUE sock, VALUE host, VALUE serv)
 {
-    static init = 0;
+    static int init = 0;
 
     if (init == 0) {
 	SOCKSinit("ruby");

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