19991208

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

10 files changed, 18 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index ffaa2bb03a..5ec0405ea9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,9 +4,9 @@ Tue Dec  7 18:25:26 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 Mon Dec  6 15:55:30 1999  EGUCHI Osamu  <eguchi@shizuokanet.ne.jp>
 
-	* numeric.c (fix_rshift): Fix -1 >> 32 returned 0. (-1 is true)
+	* numeric.c (fix_rshift): Fix -1 >> 32 returned 0 (should be -1).
 
-	* numeric.c (fix_rshift): Fix  1 >> -1 returned 0. (2 is true)
+	* numeric.c (fix_rshift): Fix  1 >> -1 returned 0 (should be 2).
 
 Mon Dec  6 11:47:23 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
diff --git a/MANIFEST b/MANIFEST
index 67ccf3f46a..3036333d73 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -222,7 +222,6 @@ sample/rename.rb
 sample/rcs.awk
 sample/rcs.dat
 sample/rcs.rb
-sample/rd2html.rb
 sample/regx.rb
 sample/sieve.rb
 sample/svr.rb
diff --git a/configure b/configure
index 8a964db77c..fc3575ea03 100644
--- a/configure
+++ b/configure
@@ -2199,7 +2199,7 @@ fi
 
 for ac_hdr in stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\
 		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
-		 syscall.h pwd.h a.out.h utime.h memory.h direct.h fnmatch.h
+		 syscall.h pwd.h a.out.h utime.h memory.h direct.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -3041,7 +3041,7 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
 
 for ac_func in dup2 memmove mkdir strcasecmp strncasecmp strerror strftime\
 		 strchr strstr strtoul strdup crypt flock vsnprintf\
-		 fnmatch isinf isnan finite
+		 isinf isnan finite
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:3048: checking for $ac_func" >&5
diff --git a/configure.in b/configure.in
index a595f6eec1..d046257ae6 100644
--- a/configure.in
+++ b/configure.in
@@ -156,7 +156,7 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\
 		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
-		 syscall.h pwd.h a.out.h utime.h memory.h direct.h fnmatch.h)
+		 syscall.h pwd.h a.out.h utime.h memory.h direct.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_UID_T
@@ -175,7 +175,7 @@ AC_FUNC_VFORK
 AC_FUNC_MEMCMP
 AC_REPLACE_FUNCS(dup2 memmove mkdir strcasecmp strncasecmp strerror strftime\
 		 strchr strstr strtoul strdup crypt flock vsnprintf\
-		 fnmatch isinf isnan finite)
+		 isinf isnan finite)
 AC_CHECK_FUNCS(fmod killpg drand48 random wait4 waitpid syscall getcwd\
 	      truncate chsize times utimes fcntl lockf setitimer\
 	      setruid seteuid setreuid setrgid setegid setregid\
diff --git a/eval.c b/eval.c
index 1f00dff714..93b94acf7a 100644
--- a/eval.c
+++ b/eval.c
@@ -7333,10 +7333,10 @@ static int
 rb_thread_loading(feature)
     const char *feature;
 {
+    if (!loading_tbl) {
+	loading_tbl = st_init_strtable();
+    }
     if (!rb_provided(feature)) {
-	if (!loading_tbl) {
-	    loading_tbl = st_init_strtable();
-	}
 	st_insert(loading_tbl, feature, 0);
 	return Qfalse; /* need to load */
     }
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 a1d707122e..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>
@@ -890,7 +890,9 @@ tcp_s_gethostbyname(obj, host)
 	    struct sockaddr_in6 sin6;
 	    MEMZERO(&sin6, struct sockaddr_in6, 1);
 	    sin6.sin6_family = AF_INET;
+#ifdef SIN6_LEN
 	    sin6.sin6_len = sizeof(sin6);
+#endif
 	    memcpy((char *) &sin6.sin6_addr, *pch, h->h_length);
 	    h = gethostbyaddr((char *)&sin6.sin6_addr,
 			      sizeof(sin6.sin6_addr),
diff --git a/version.h b/version.h
index f5950c05af..d2c105f4cf 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.4.3"
-#define RUBY_RELEASE_DATE "1999-12-07"
-#define RUBY_VERSION_CODE 143
-#define RUBY_RELEASE_CODE 19991207
+#define RUBY_RELEASE_DATE "1999-12-08"
+#define RUBY_VERSION_CODE 144
+#define RUBY_RELEASE_CODE 19991208
diff --git a/win32/Makefile b/win32/Makefile
index f84c96bc3f..24148b3c87 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -19,7 +19,7 @@ LDFLAGS = $(CFLAGS) -Fm
 XLDFLAGS = 
 #EXTLIBS = 
 LIBS = advapi32.lib wsock32.lib $(EXTLIBS)
-MISSING = crypt.obj alloca.obj win32.obj fnmatch.obj isinf.obj isnan.obj
+MISSING = crypt.obj alloca.obj win32.obj isinf.obj isnan.obj
 LDSHARED = 
 DLDFLAGS = 
 SOLIBS = 
@@ -166,9 +166,6 @@ isinf.obj: missing/isinf.c
 isnan.obj: missing/isnan.c
 	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c missing/isnan.c
 
-fnmatch.obj: missing/fnmatch.c
-	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c missing/fnmatch.c
-
 memcmp.obj: missing/memcmp.c
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c missing/memcmp.c
 
diff --git a/win32/config.status b/win32/config.status
index 9b959ff4bb..ff19d709a6 100644
--- a/win32/config.status
+++ b/win32/config.status
@@ -35,7 +35,7 @@ s%@RANLIB@%rem%g
 s%@AR@%lib -nologo%g
 s%@LN_S@%%g
 s%@SET_MAKE@%%g
-s%@LIBOBJS@% crypt.obj alloca.obj win32.obj fnmatch.obj isinf.obj isnan.obj%g
+s%@LIBOBJS@% crypt.obj alloca.obj win32.obj isinf.obj isnan.obj%g
 s%@ALLOCA@%%g
 s%@DEFAULT_KCODE@%%g
 s%@EXEEXT@%.exe%g