From 320e99d8dda5eb5fc327fcbe20126cdd7fcd059d Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 8 Feb 2000 08:54:01 +0000
Subject: 2000-02-08

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/getaddrinfo.c | 6 ------
 ext/socket/getnameinfo.c | 6 ------
 ext/socket/socket.c      | 2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'ext/socket')

diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index d89c7851be..d99ad12506 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -130,12 +130,6 @@ static struct afd {
 #define PTON_MAX	4
 #endif
 
-#ifndef INET6
-#ifndef NT
-extern int h_errno;
-#endif
-#endif
-
 static int get_name __P((const char *, struct afd *,
 			  struct addrinfo **, char *, struct addrinfo *,
 			  int));
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index 6a71d1d6f6..2fbb8d8037 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -64,12 +64,6 @@
 #include "addrinfo.h"
 #include "sockport.h"
 
-#ifndef INET6
-#ifndef NT
-extern int h_errno;
-#endif
-#endif
-
 #define SUCCESS 0
 #define ANY 0
 #define YES 1
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index d680adc325..0a61160e99 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -399,8 +399,8 @@ s_recv(sock, argc, argv, from)
     str = rb_str_new(0, NUM2INT(len));
 
     rb_thread_wait_fd(fd);
-    TRAP_BEG;
   retry:
+    TRAP_BEG;
     RSTRING(str)->len = recvfrom(fd, RSTRING(str)->ptr, RSTRING(str)->len, flags,
 				 (struct sockaddr*)buf, &alen);
     TRAP_END;
-- 
cgit v1.2.3