From f137a720e935dd8461a6153c83b78b6cc269c744 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 20 Oct 1999 07:10:23 +0000
Subject: marshal load GC protect

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/extconf.rb    | 1 -
 ext/socket/getaddrinfo.c | 5 -----
 ext/socket/socket.c      | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'ext/socket')

diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 467c052a8..6975994ef 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -148,7 +148,6 @@ EOF
     $CFLAGS="-DHAVE_SA_LEN "+$CFLAGS
 end
 
-have_header("sys/sysctl.h")
 have_header("netinet/tcp.h")
 have_header("netinet/udp.h")
 
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index 501ebd500..ebb03fe95 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -41,11 +41,6 @@
 #include <sys/types.h>
 #ifndef NT
 #include <sys/param.h>
-#endif
-#ifdef HAVE_SYSCTL_H
-#include <sys/sysctl.h>
-#endif
-#ifndef NT
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 408257eeb..b38cc48c9 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -16,10 +16,10 @@
 #ifndef NT
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifdef NETINET_TCP
+#ifdef HAVE_NETINET_TCP_H
 # include <netinet/tcp.h>
 #endif
-#ifdef NETINET_UDP
+#ifdef HAVE_NETINET_UDP_H
 # include <netinet/udp.h>
 #endif
 #include <netdb.h>
-- 
cgit