From 58ac90ff773d7fc5107d7f2a886dd475053115f9 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/nkf/nkf.c            | 4 +++-
 ext/socket/extconf.rb    | 1 -
 ext/socket/getaddrinfo.c | 5 -----
 ext/socket/socket.c      | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'ext')

diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index cde0f7a9a6..b59688cb03 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -49,6 +49,7 @@ rb_nkf_kconv(obj, opt, src)
 {
   int i;
   char *opt_ptr, *opt_end;
+  volatile VALUE v;
 
   reinit();
   opt_ptr = str2cstr(opt, &i);
@@ -64,7 +65,8 @@ rb_nkf_kconv(obj, opt, src)
 
   input_ctr = 0; 
   input     = str2cstr(src, &i_len);
-  dst = rb_str_new(0, i_len*3 + 10); /* large enough? */
+  dst = rb_str_new(0, i_len*3 + 10);
+  v = dst;
 
   output_ctr = 0;
   output     = RSTRING(dst)->ptr;
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 467c052a85..6975994ef8 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 501ebd5006..ebb03fe959 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 408257eeb6..b38cc48c98 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 v1.2.3