* ext/socket/init.c (socks_connect_blocking): moved from

  sockssocket.c.  [ruby-dev:37834]

* sockssocket.c (socks_init): don't omit "int" type.



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 10 insertions, 10 deletions

diff --git a/ext/socket/init.c b/ext/socket/init.c
index 1859777e9..a21c73003 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -333,6 +333,15 @@ connect_blocking(void *data)
     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)
 {
diff --git a/ext/socket/sockssocket.c b/ext/socket/sockssocket.c
index 640ddd2f4..70a6b4756 100644
--- a/ext/socket/sockssocket.c
+++ b/ext/socket/sockssocket.c
@@ -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");