diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-06-20 06:08:52 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-06-20 06:08:52 +0000 |
commit | 79a5d02e194a5eee47ce2456019cfe2d31565969 (patch) | |
tree | 01dd9b3b9f5e258211ccc691a327f368bcd0efb3 | |
parent | dc9d02aa1d984a0d3a5e768dd0ec8940e7474c8c (diff) |
2000-06-20
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 33 | ||||
-rw-r--r-- | configure | 426 | ||||
-rw-r--r-- | configure.in | 19 | ||||
-rw-r--r-- | eval.c | 81 | ||||
-rw-r--r-- | ext/dbm/dbm.c | 9 | ||||
-rw-r--r-- | ext/gdbm/gdbm.c | 9 | ||||
-rw-r--r-- | ext/sdbm/init.c | 9 | ||||
-rw-r--r-- | io.c | 3 | ||||
-rw-r--r-- | lib/parsedate.rb | 4 | ||||
-rw-r--r-- | rubytest.rb | 2 | ||||
-rw-r--r-- | time.c | 17 | ||||
-rw-r--r-- | version.h | 8 |
12 files changed, 353 insertions, 267 deletions
@@ -1,9 +1,42 @@ +Tue Jun 20 15:07:39 2000 Yukihiro Matsumoto <matz@netlab.co.jp> + + * lib/parsedate.rb: don't seek year too greedy. + Tue Jun 20 06:14:43 2000 Wakou Aoyama <wakou@fsinet.or.jp> * lib/cgi.rb: change: version syntax. old: x.yz, now: x.y.z * lib/net/telnet.rb: ditto. +Fri Jun 16 05:18:45 2000 Yasuhiro Fukuma <yasuf@bsdclub.org> + + * configure.in: FreeBSD: do not link dummy libxpg4 which was + merged into libc. + +Fri Jun 16 03:17:36 2000 Satoshi Nojo <nojo@t-samukawa.or.jp> + + * ext/dbm/dbm.c (fdbm_length): use GetDBM. empty?, [] too. + + * ext/gdbm/gdbm.c (fgdbm_length): ditto. + + * ext/sdbm/init.c (fsdbm_length): ditto. + +Wed Jun 14 17:01:41 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp> + + * rubytest.rb: add CONFIG['EXEEXT'] to the executable file name. + +Wed Jun 14 14:50:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp> + + * eval.c (method_arity): wrong arity number for the methods with + optional arguments. + + * time.c (make_time_t): opposite timezone shift (should be negative). + +Wed 14 Jun 04:58:53 2000 Dave Thomas <dave@thomases.com> + + * io.c (rb_io_set_lineno): should have returned VALUE, not + integer. + Wed Jun 14 13:17:02 2000 WATANABE Hirofumi <eban@os.rim.or.jp> * io.c: typo(ig/if). @@ -1738,31 +1738,63 @@ human*) ac_cv_func_getpgrp_void=yes;; beos*) ;; cygwin*) ;; os2_emx*) LIBS="-lm $LIBS" - ac_cv_lib_xpg4_setlocale=no ac_cv_lib_dir_opendir=no;; -*) LIBS="-lm $LIBS";; -esac -echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:1747: checking for crypt in -lcrypt" >&5 -ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` +freebsd*) LIBS="-lm $LIBS" + echo $ac_n "checking whether -lxpg4 has to be linked""... $ac_c" 1>&6 +echo "configure:1745: checking whether -lxpg4 has to be linked" >&5 +if eval "test \"`echo '$''{'rb_cv_lib_xpg4_needed'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1750 "configure" +#include "confdefs.h" + +#include <osreldate.h> +#if __FreeBSD_version < 400020 || \ + (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005) +#error needs libxpg4 +#endif + +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + rb_cv_lib_xpg4_needed=no +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + rb_cv_lib_xpg4_needed=yes +fi +rm -f conftest* +fi + +echo "$ac_t""$rb_cv_lib_xpg4_needed" 1>&6 + if test "$rb_cv_lib_xpg4_needed" = yes; then + echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6 +echo "configure:1779: checking for setlocale in -lxpg4" >&5 +ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lcrypt $LIBS" +LIBS="-lxpg4 $LIBS" cat > conftest.$ac_ext <<EOF -#line 1755 "configure" +#line 1787 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char crypt(); +char setlocale(); int main() { -crypt() +setlocale() ; return 0; } EOF -if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1777,39 +1809,43 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo crypt | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo xpg4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <<EOF #define $ac_tr_lib 1 EOF - LIBS="-lcrypt $LIBS" + LIBS="-lxpg4 $LIBS" else echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1794: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + fi + ;; +*) LIBS="-lm $LIBS";; +esac +echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 +echo "configure:1830: checking for crypt in -lcrypt" >&5 +ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ldl $LIBS" +LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 1802 "configure" +#line 1838 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dlopen(); +char crypt(); int main() { -dlopen() +crypt() ; return 0; } EOF -if { (eval echo configure:1813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1824,39 +1860,39 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo crypt | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <<EOF #define $ac_tr_lib 1 EOF - LIBS="-ldl $LIBS" + LIBS="-lcrypt $LIBS" else echo "$ac_t""no" 1>&6 fi - # Dynamic linking for SunOS/Solaris and SYSV -echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:1841: checking for shl_load in -ldld" >&5 -ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` + +echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "configure:1877: checking for dlopen in -ldl" >&5 +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ldld $LIBS" +LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1849 "configure" +#line 1885 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char shl_load(); +char dlopen(); int main() { -shl_load() +dlopen() ; return 0; } EOF -if { (eval echo configure:1860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1871,39 +1907,39 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo dld | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <<EOF #define $ac_tr_lib 1 EOF - LIBS="-ldld $LIBS" + LIBS="-ldl $LIBS" else echo "$ac_t""no" 1>&6 fi - # Dynamic linking for HP-UX -echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6 -echo "configure:1888: checking for setlocale in -lxpg4" >&5 -ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'` + # Dynamic linking for SunOS/Solaris and SYSV +echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 +echo "configure:1924: checking for shl_load in -ldld" >&5 +ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lxpg4 $LIBS" +LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 1896 "configure" +#line 1932 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char setlocale(); +char shl_load(); int main() { -setlocale() +shl_load() ; return 0; } EOF -if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1918,30 +1954,30 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo xpg4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + ac_tr_lib=HAVE_LIB`echo dld | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <<EOF #define $ac_tr_lib 1 EOF - LIBS="-lxpg4 $LIBS" + LIBS="-ldld $LIBS" else echo "$ac_t""no" 1>&6 fi - # FreeBSD needs this + # Dynamic linking for HP-UX ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1940: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1976: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1945 "configure" +#line 1981 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -1949,7 +1985,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1974,7 +2010,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1978: checking for opendir in -ldir" >&5 +echo "configure:2014: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1982,7 +2018,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 1986 "configure" +#line 2022 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1993,7 +2029,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:1997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2015,7 +2051,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2019: checking for opendir in -lx" >&5 +echo "configure:2055: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2023,7 +2059,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 2027 "configure" +#line 2063 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2034,7 +2070,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:2038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2057,12 +2093,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2061: checking for ANSI C header files" >&5 +echo "configure:2097: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2066 "configure" +#line 2102 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2070,7 +2106,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2087,7 +2123,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2091 "configure" +#line 2127 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2105,7 +2141,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2109 "configure" +#line 2145 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2126,7 +2162,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2130 "configure" +#line 2166 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2137,7 +2173,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2161,12 +2197,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2165: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2201: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2170 "configure" +#line 2206 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -2182,7 +2218,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2208,17 +2244,17 @@ for ac_hdr in stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2212: checking for $ac_hdr" >&5 +echo "configure:2248: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2217 "configure" +#line 2253 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2246,12 +2282,12 @@ done echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2250: checking for uid_t in sys/types.h" >&5 +echo "configure:2286: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2255 "configure" +#line 2291 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -2280,12 +2316,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2284: checking for size_t" >&5 +echo "configure:2320: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2289 "configure" +#line 2325 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2313,12 +2349,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:2317: checking for st_blksize in struct stat" >&5 +echo "configure:2353: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2322 "configure" +#line 2358 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -2326,7 +2362,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:2330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -2348,12 +2384,12 @@ fi save_LIBOJBS="$LIBOBJS" echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:2352: checking for st_blocks in struct stat" >&5 +echo "configure:2388: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2357 "configure" +#line 2393 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -2361,7 +2397,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:2365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -2385,12 +2421,12 @@ fi LIBOBJS="$save_LIBOBJS" echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:2389: checking for st_rdev in struct stat" >&5 +echo "configure:2425: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2394 "configure" +#line 2430 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -2398,7 +2434,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:2402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2420,7 +2456,7 @@ fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:2424: checking type of array argument to getgroups" >&5 +echo "configure:2460: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2428,7 +2464,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 2432 "configure" +#line 2468 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -2453,7 +2489,7 @@ main() } EOF -if { (eval echo configure:2457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -2467,7 +2503,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 2471 "configure" +#line 2507 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -2491,12 +2527,12 @@ EOF echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2495: checking return type of signal handlers" >&5 +echo "configure:2531: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2500 "configure" +#line 2536 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2513,7 +2549,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2534,19 +2570,19 @@ EOF # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2538: checking for working alloca.h" >&5 +echo "configure:2574: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2543 "configure" +#line 2579 "configure" #include "confdefs.h" #include <alloca.h> int main() { void *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2567,12 +2603,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2571: checking for alloca" >&5 +echo "configure:2607: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2576 "configure" +#line 2612 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -2600,7 +2636,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:2604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2632,12 +2668,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2636: checking whether alloca needs Cray hooks" >&5 +echo "configure:2672: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2641 "configure" +#line 2677 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -2662,12 +2698,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2666: checking for $ac_func" >&5 +echo "configure:2702: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2671 "configure" +#line 2707 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2690,7 +2726,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2717,7 +2753,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2721: checking stack direction for C alloca" >&5 +echo "configure:2757: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2725,7 +2761,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 2729 "configure" +#line 2765 "configure" #include "confdefs.h" find_stack_direction () { @@ -2744,7 +2780,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:2748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2766,12 +2802,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2770: checking for pid_t" >&5 +echo "configure:2806: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2775 "configure" +#line 2811 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2800,17 +2836,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:2804: checking for vfork.h" >&5 +echo "configure:2840: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2809 "configure" +#line 2845 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2835,18 +2871,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:2839: checking for working vfork" >&5 +echo "configure:2875: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:2845: checking for vfork" >&5 +echo "configure:2881: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2850 "configure" +#line 2886 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -2869,7 +2905,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -2891,7 +2927,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext <<EOF -#line 2895 "configure" +#line 2931 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -2986,7 +3022,7 @@ main() { } } EOF -if { (eval echo configure:2990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -3009,7 +3045,7 @@ EOF fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3013: checking for 8-bit clean memcmp" >&5 +echo "configure:3049: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3017,7 +3053,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <<EOF -#line 3021 "configure" +#line 3057 "configure" #include "confdefs.h" main() @@ -3027,7 +3063,7 @@ main() } EOF -if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3049,12 +3085,12 @@ for ac_func in dup2 memmove mkdir strcasecmp strncasecmp strerror strftime\ isinf isnan finite do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3053: checking for $ac_func" >&5 +echo "configure:3089: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3058 "configure" +#line 3094 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3077,7 +3113,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3110,12 +3146,12 @@ for ac_func in fmod killpg drand48 random wait4 waitpid syscall getcwd\ dlopen sigprocmask sigaction _setjmp setsid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3114: checking for $ac_func" >&5 +echo "configure:3150: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3119 "configure" +#line 3155 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3138,7 +3174,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3163,12 +3199,12 @@ fi done echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3167: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3203: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3172 "configure" +#line 3208 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -3176,7 +3212,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3197,12 +3233,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3201: checking for tm_zone in struct tm" >&5 +echo "configure:3237: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3206 "configure" +#line 3242 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -3210,7 +3246,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3230,12 +3266,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3234: checking for tzname" >&5 +echo "configure:3270: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3239 "configure" +#line 3275 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -3245,7 +3281,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3268,14 +3304,14 @@ fi if test "$ac_cv_func_strftime" = no; then cat > conftest.$ac_ext <<EOF -#line 3272 "configure" +#line 3308 "configure" #include "confdefs.h" int main() { extern int daylight; int i = daylight; ; return 0; } EOF -if { (eval echo configure:3279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_DAYLIGHT 1 @@ -3295,7 +3331,7 @@ EOF else echo $ac_n "checking for BSD signal semantics""... $ac_c" 1>&6 -echo "configure:3299: checking for BSD signal semantics" >&5 +echo "configure:3335: checking for BSD signal semantics" >&5 if eval "test \"`echo '$''{'rb_cv_bsd_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3303,7 +3339,7 @@ else rb_cv_bsd_signal=no else cat > conftest.$ac_ext <<EOF -#line 3307 "configure" +#line 3343 "configure" #include "confdefs.h" #include <stdio.h> @@ -3325,7 +3361,7 @@ main() } EOF -if { (eval echo configure:3329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_bsd_signal=yes else @@ -3349,7 +3385,7 @@ EOF fi echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:3353: checking whether getpgrp takes no argument" >&5 +echo "configure:3389: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3357,7 +3393,7 @@ else { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3361 "configure" +#line 3397 "configure" #include "confdefs.h" /* @@ -3412,7 +3448,7 @@ main() } EOF -if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else @@ -3436,7 +3472,7 @@ EOF fi echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:3440: checking whether setpgrp takes no argument" >&5 +echo "configure:3476: checking whether setpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3444,7 +3480,7 @@ else { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3448 "configure" +#line 3484 "configure" #include "confdefs.h" #ifdef HAVE_UNISTD_H @@ -3464,7 +3500,7 @@ main() } EOF -if { (eval echo configure:3468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setpgrp_void=no else @@ -3489,7 +3525,7 @@ fi echo $ac_n "checking for working strtod""... $ac_c" 1>&6 -echo "configure:3493: checking for working strtod" >&5 +echo "configure:3529: checking for working strtod" >&5 if eval "test \"`echo '$''{'rb_cv_func_strtod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3497,7 +3533,7 @@ else rb_cv_func_strtod=no else cat > conftest.$ac_ext <<EOF -#line 3501 "configure" +#line 3537 "configure" #include "confdefs.h" double strtod (); @@ -3527,7 +3563,7 @@ main() } EOF -if { (eval echo configure:3531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_func_strtod=yes else @@ -3545,14 +3581,14 @@ echo "$ac_t""$rb_cv_func_strtod" 1>&6 test $rb_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o" echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3549: checking whether byte ordering is bigendian" >&5 +echo "configure:3585: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 3556 "configure" +#line 3592 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3563,11 +3599,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 3571 "configure" +#line 3607 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3578,7 +3614,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3598,7 +3634,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3602 "configure" +#line 3638 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -3611,7 +3647,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3635,12 +3671,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3639: checking for working const" >&5 +echo "configure:3675: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3644 "configure" +#line 3680 "configure" #include "confdefs.h" int main() { @@ -3689,7 +3725,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:3693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3710,14 +3746,14 @@ EOF fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3714: checking whether char is unsigned" >&5 +echo "configure:3750: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <<EOF -#line 3721 "configure" +#line 3757 "configure" #include "confdefs.h" #ifdef __CHAR_UNSIGNED__ yes @@ -3739,7 +3775,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3743 "configure" +#line 3779 "configure" #include "confdefs.h" /* volatile prevents gcc2 from optimizing the test away on sparcs. */ #if !defined(__STDC__) || __STDC__ != 1 @@ -3749,7 +3785,7 @@ main() { volatile char c = 255; exit(c < 0); } EOF -if { (eval echo configure:3753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3774,7 +3810,7 @@ fi echo $ac_n "checking whether right shift preserve sign bit""... $ac_c" 1>&6 -echo "configure:3778: checking whether right shift preserve sign bit" >&5 +echo "configure:3814: checking whether right shift preserve sign bit" >&5 if eval "test \"`echo '$''{'rb_cv_rshift_sign'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3782,7 +3818,7 @@ else rb_cv_rshift_sign=yes else cat > conftest.$ac_ext <<EOF -#line 3786 "configure" +#line 3822 "configure" #include "confdefs.h" int @@ -3794,7 +3830,7 @@ main() } EOF -if { (eval echo configure:3798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_rshift_sign=yes else @@ -3822,19 +3858,19 @@ EOF fi echo $ac_n "checking count field in FILE structures""... $ac_c" 1>&6 -echo "configure:3826: checking count field in FILE structures" >&5 +echo "configure:3862: checking count field in FILE structures" >&5 if eval "test \"`echo '$''{'rb_cv_fcnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3831 "configure" +#line 3867 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->_cnt = 0; ; return 0; } EOF -if { (eval echo configure:3838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="_cnt" else @@ -3844,14 +3880,14 @@ fi rm -f conftest* if test "$rb_cv_fcnt" = ""; then cat > conftest.$ac_ext <<EOF -#line 3848 "configure" +#line 3884 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->__cnt = 0; ; return 0; } EOF -if { (eval echo configure:3855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="__cnt" else @@ -3862,14 +3898,14 @@ rm -f conftest* fi if test "$rb_cv_fcnt" = ""; then cat > conftest.$ac_ext <<EOF -#line 3866 "configure" +#line 3902 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->_r = 0; ; return 0; } EOF -if { (eval echo configure:3873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="_r" else @@ -3880,14 +3916,14 @@ rm -f conftest* fi if test "$rb_cv_fcnt" = ""; then cat > conftest.$ac_ext <<EOF -#line 3884 "configure" +#line 3920 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->readCount = 0; ; return 0; } EOF -if { (eval echo configure:3891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="readCount" else @@ -3898,14 +3934,14 @@ rm -f conftest* fi if test "$rb_cv_fcnt" = ""; then cat > conftest.$ac_ext <<EOF -#line 3902 "configure" +#line 3938 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->_rcount = 0; ; return 0; } EOF -if { (eval echo configure:3909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="_rcount" else @@ -3973,7 +4009,7 @@ fi echo $ac_n "checking whether ELF binaries are produced""... $ac_c" 1>&6 -echo "configure:3977: checking whether ELF binaries are produced" >&5 +echo "configure:4013: checking whether ELF binaries are produced" >&5 if eval "test \"`echo '$''{'rb_cv_binary_elf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3981,7 +4017,7 @@ else rb_cv_binary_elf=yes else cat > conftest.$ac_ext <<EOF -#line 3985 "configure" +#line 4021 "configure" #include "confdefs.h" /* Test for whether ELF binaries are produced */ @@ -4001,7 +4037,7 @@ main() { } EOF -if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_binary_elf=yes else @@ -4049,7 +4085,7 @@ STATIC= if test "$with_dln_a_out" != yes; then rb_cv_dlopen=unknown echo $ac_n "checking whether OS depend dynamic link works""... $ac_c" 1>&6 -echo "configure:4053: checking whether OS depend dynamic link works" >&5 +echo "configure:4089: checking whether OS depend dynamic link works" >&5 if test "$GCC" = yes; then case "$host_os" in nextstep*) ;; @@ -4169,12 +4205,12 @@ if test "$ac_cv_header_a_out_h" = yes; then if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then cat confdefs.h > config.h echo $ac_n "checking whether matz's dln works""... $ac_c" 1>&6 -echo "configure:4173: checking whether matz's dln works" >&5 +echo "configure:4209: checking whether matz's dln works" >&5 if eval "test \"`echo '$''{'rb_cv_dln_a_out'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4178 "configure" +#line 4214 "configure" #include "confdefs.h" #define USE_DLN_A_OUT @@ -4184,7 +4220,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_dln_a_out=yes else @@ -4291,7 +4327,7 @@ fi case "$host_os" in human*) echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6 -echo "configure:4295: checking for _harderr in -lsignal" >&5 +echo "configure:4331: checking for _harderr in -lsignal" >&5 ac_lib_var=`echo signal'_'_harderr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4299,7 +4335,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsignal $LIBS" cat > conftest.$ac_ext <<EOF -#line 4303 "configure" +#line 4339 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4310,7 +4346,7 @@ int main() { _harderr() ; return 0; } EOF -if { (eval echo configure:4314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4338,7 +4374,7 @@ else fi echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6 -echo "configure:4342: checking for hmemset in -lhmem" >&5 +echo "configure:4378: checking for hmemset in -lhmem" >&5 ac_lib_var=`echo hmem'_'hmemset | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4346,7 +4382,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lhmem $LIBS" cat > conftest.$ac_ext <<EOF -#line 4350 "configure" +#line 4386 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4357,7 +4393,7 @@ int main() { hmemset() ; return 0; } EOF -if { (eval echo configure:4361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4387,12 +4423,12 @@ fi for ac_func in select gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4391: checking for $ac_func" >&5 +echo "configure:4427: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4396 "configure" +#line 4432 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4415,7 +4451,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4440,7 +4476,7 @@ fi done echo $ac_n "checking whether PD libc _dtos18 fail to convert big number""... $ac_c" 1>&6 -echo "configure:4444: checking whether PD libc _dtos18 fail to convert big number" >&5 +echo "configure:4480: checking whether PD libc _dtos18 fail to convert big number" >&5 if eval "test \"`echo '$''{'rb_cv_missing__dtos18'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4448,7 +4484,7 @@ else rb_cv_missing__dtos18=no else cat > conftest.$ac_ext <<EOF -#line 4452 "configure" +#line 4488 "configure" #include "confdefs.h" #include <stdio.h> @@ -4460,7 +4496,7 @@ main () } EOF -if { (eval echo configure:4464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_missing__dtos18=yes else @@ -4482,7 +4518,7 @@ EOF fi echo $ac_n "checking whether PD libc fconvert fail to round""... $ac_c" 1>&6 -echo "configure:4486: checking whether PD libc fconvert fail to round" >&5 +echo "configure:4522: checking whether PD libc fconvert fail to round" >&5 if eval "test \"`echo '$''{'rb_cv_missing_fconvert'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4490,7 +4526,7 @@ else rb_cv_missing_fconvert=no else cat > conftest.$ac_ext <<EOF -#line 4494 "configure" +#line 4530 "configure" #include "confdefs.h" #include <stdio.h> @@ -4503,7 +4539,7 @@ main () } EOF -if { (eval echo configure:4507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_missing_fconvert=yes else diff --git a/configure.in b/configure.in index 7bf19d42b3..5a6ca2705b 100644 --- a/configure.in +++ b/configure.in @@ -144,14 +144,29 @@ human*) ac_cv_func_getpgrp_void=yes;; beos*) ;; cygwin*) ;; os2_emx*) LIBS="-lm $LIBS" - ac_cv_lib_xpg4_setlocale=no ac_cv_lib_dir_opendir=no;; +freebsd*) LIBS="-lm $LIBS" + AC_CACHE_CHECK([whether -lxpg4 has to be linked], + rb_cv_lib_xpg4_needed, + [AC_TRY_CPP([ +#include <osreldate.h> +#if __FreeBSD_version < 400020 || \ + (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005) +#error needs libxpg4 +#endif + ], + rb_cv_lib_xpg4_needed=no, + rb_cv_lib_xpg4_needed=yes, + rb_cv_lib_xpg4_needed=yes)]) + if test "$rb_cv_lib_xpg4_needed" = yes; then + AC_CHECK_LIB(xpg4, setlocale) + fi + ;; *) LIBS="-lm $LIBS";; esac AC_CHECK_LIB(crypt, crypt) AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX -AC_CHECK_LIB(xpg4, setlocale) # FreeBSD needs this dnl Checks for header files. AC_HEADER_DIRENT @@ -5981,7 +5981,8 @@ method_arity(method) body = body->nd_head; if (!body) return INT2FIX(0); n = body->nd_cnt; - if (body->nd_rest >= 0) n = -n-1; + if (body->nd_opt || body->nd_rest >= 0) + n = -n-1; return INT2FIX(n); } } @@ -6114,7 +6115,7 @@ enum thread_status { /* +infty, for this purpose */ #define DELAY_INFTY 1E30 -typedef struct thread * thread_t; +typedef struct thread * rb_thread_t; struct thread { struct thread *next, *prev; @@ -6152,7 +6153,7 @@ struct thread { int wait_for; int fd; double delay; - thread_t join; + rb_thread_t join; int abort; @@ -6163,8 +6164,8 @@ struct thread { #define THREAD_RAISED 0x200 -static thread_t main_thread; -static thread_t curr_thread = 0; +static rb_thread_t main_thread; +static rb_thread_t curr_thread = 0; static int num_waiting_on_fd = 0; static int num_waiting_on_timer = 0; @@ -6190,7 +6191,7 @@ timeofday() static void thread_mark(th) - thread_t th; + rb_thread_t th; { struct FRAME *frame; struct BLOCK *block; @@ -6245,7 +6246,7 @@ thread_mark(th) void rb_gc_mark_threads() { - thread_t th; + rb_thread_t th; if (!curr_thread) return; FOREACH_THREAD(th) { @@ -6255,7 +6256,7 @@ rb_gc_mark_threads() static void thread_free(th) - thread_t th; + rb_thread_t th; { if (th->stk_ptr) free(th->stk_ptr); th->stk_ptr = 0; @@ -6267,7 +6268,7 @@ thread_free(th) if (th != main_thread) free(th); } -static thread_t +static rb_thread_t rb_thread_check(data) VALUE data; { @@ -6275,7 +6276,7 @@ rb_thread_check(data) rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)", rb_class2name(CLASS_OF(data))); } - return (thread_t)RDATA(data)->data; + return (rb_thread_t)RDATA(data)->data; } static int th_raise_argc; @@ -6295,7 +6296,7 @@ static char *th_signm; static void rb_thread_save_context(th) - thread_t th; + rb_thread_t th; { VALUE v; @@ -6365,11 +6366,11 @@ thread_switch(n) #define THREAD_SAVE_CONTEXT(th) \ (rb_thread_save_context(th),thread_switch(setjmp((th)->context))) -static void rb_thread_restore_context _((thread_t,int)); +static void rb_thread_restore_context _((rb_thread_t,int)); static void stack_extend(th, exit) - thread_t th; + rb_thread_t th; int exit; { VALUE space[1024]; @@ -6380,11 +6381,11 @@ stack_extend(th, exit) static void rb_thread_restore_context(th, exit) - thread_t th; + rb_thread_t th; int exit; { VALUE v; - static thread_t tmp; + static rb_thread_t tmp; static int ex; if (!th->stk_ptr) rb_bug("unsaved context"); @@ -6428,7 +6429,7 @@ rb_thread_restore_context(th, exit) static void rb_thread_ready(th) - thread_t th; + rb_thread_t th; { /* The thread is no longer waiting on anything */ if (th->wait_for & WAIT_FD) { @@ -6455,7 +6456,7 @@ rb_thread_remove() static int rb_thread_dead(th) - thread_t th; + rb_thread_t th; { return th->status == THREAD_KILLED; } @@ -6464,7 +6465,7 @@ void rb_thread_fd_close(fd) int fd; { - thread_t th; + rb_thread_t th; FOREACH_THREAD(th) { if ((th->wait_for & WAIT_FD) && th->fd == fd) { @@ -6505,9 +6506,9 @@ rb_thread_deadlock() void rb_thread_schedule() { - thread_t next; /* OK */ - thread_t th; - thread_t curr; + rb_thread_t next; /* OK */ + rb_thread_t th; + rb_thread_t curr; select_err: rb_thread_pending = 0; @@ -6841,7 +6842,7 @@ static VALUE rb_thread_join(thread) VALUE thread; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); if (!rb_thread_dead(th)) { if (th == curr_thread) @@ -6894,7 +6895,7 @@ VALUE rb_thread_wakeup(thread) VALUE thread; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); if (th->status == THREAD_KILLED) rb_raise(rb_eThreadError, "killed thread"); @@ -6917,7 +6918,7 @@ static VALUE rb_thread_kill(thread) VALUE thread; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); if (th->status == THREAD_TO_KILL || th->status == THREAD_KILLED) return thread; @@ -7014,7 +7015,7 @@ static VALUE rb_thread_abort_exc(thread) VALUE thread; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); return th->abort?Qtrue:Qfalse; } @@ -7023,7 +7024,7 @@ static VALUE rb_thread_abort_exc_set(thread, val) VALUE thread, val; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); th->abort = RTEST(val); return val; @@ -7060,11 +7061,11 @@ rb_thread_abort_exc_set(thread, val) th->locals = 0;\ } while(0) -static thread_t +static rb_thread_t rb_thread_alloc(klass) VALUE klass; { - thread_t th; + rb_thread_t th; THREAD_ALLOC(th); th->thread = Data_Wrap_Struct(klass, thread_mark, thread_free, th); @@ -7140,7 +7141,7 @@ rb_thread_create_0(fn, arg, klass) void *arg; VALUE klass; { - thread_t th = rb_thread_alloc(klass); + rb_thread_t th = rb_thread_alloc(klass); volatile VALUE thread = th->thread; enum thread_status status; int state; @@ -7215,7 +7216,7 @@ rb_thread_scope_shared_p() static VALUE rb_thread_yield(arg, th) int arg; - thread_t th; + rb_thread_t th; { scope_dup(ruby_block->scope); return rb_yield_0(th->thread, 0, 0, Qfalse); @@ -7235,7 +7236,7 @@ static VALUE rb_thread_value(thread) VALUE thread; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); rb_thread_join(thread); @@ -7246,7 +7247,7 @@ static VALUE rb_thread_status(thread) VALUE thread; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); if (rb_thread_dead(th)) { if (NIL_P(th->errinfo) && (th->flags & THREAD_RAISED)) @@ -7261,7 +7262,7 @@ static VALUE rb_thread_stop_p(thread) VALUE thread; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); if (rb_thread_dead(th)) return Qtrue; if (th->status == THREAD_STOPPED) return Qtrue; @@ -7280,7 +7281,7 @@ rb_thread_wait_other_threads() static void rb_thread_cleanup() { - thread_t th; + rb_thread_t th; if (curr_thread != curr_thread->next->prev) { curr_thread = curr_thread->prev; @@ -7372,7 +7373,7 @@ rb_thread_raise(argc, argv, thread) VALUE *argv; VALUE thread; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); if (rb_thread_dead(th)) return thread; if (curr_thread == th) { @@ -7430,7 +7431,7 @@ rb_thread_local_aref(thread, id) VALUE thread; ID id; { - thread_t th; + rb_thread_t th; VALUE val; th = rb_thread_check(thread); @@ -7454,7 +7455,7 @@ rb_thread_local_aset(thread, id, val) ID id; VALUE val; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); if (safe_level >= 4 && !FL_TEST(thread, FL_TAINT)) rb_raise(rb_eSecurityError, "Insecure: can't modify thread values"); @@ -7482,7 +7483,7 @@ static VALUE rb_thread_key_p(thread, id) VALUE thread, id; { - thread_t th = rb_thread_check(thread); + rb_thread_t th = rb_thread_check(thread); if (!th->locals) return Qfalse; if (st_lookup(th->locals, rb_to_id(id), 0)) @@ -7497,7 +7498,7 @@ rb_callcc(self) VALUE self; { volatile VALUE cont; - thread_t th; + rb_thread_t th; struct tag *tag; THREAD_ALLOC(th); @@ -7523,7 +7524,7 @@ rb_continuation_call(argc, argv, cont) VALUE *argv; VALUE cont; { - thread_t th = rb_thread_check(cont); + rb_thread_t th = rb_thread_check(cont); switch (argc) { case 0: diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index 5f76c54a2a..e6a1779e67 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -98,8 +98,7 @@ fdbm_close(obj) { struct dbmdata *dbmp; - Data_Get_Struct(obj, struct dbmdata, dbmp); - if (dbmp->di_dbm == 0) closed_dbm(); + GetDBM(obj, dbmp); dbm_close(dbmp->di_dbm); dbmp->di_dbm = 0; @@ -328,7 +327,7 @@ fdbm_store(obj, keystr, valstr) val.dptr = RSTRING(valstr)->ptr; val.dsize = RSTRING(valstr)->len; - Data_Get_Struct(obj, struct dbmdata, dbmp); + GetDBM(obj, dbmp); dbmp->di_size = -1; dbm = dbmp->di_dbm; if (dbm_store(dbm, key, val, DBM_REPLACE)) { @@ -351,7 +350,7 @@ fdbm_length(obj) DBM *dbm; int i = 0; - Data_Get_Struct(obj, struct dbmdata, dbmp); + GetDBM(obj, dbmp); if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size); dbm = dbmp->di_dbm; @@ -372,7 +371,7 @@ fdbm_empty_p(obj) DBM *dbm; int i = 0; - Data_Get_Struct(obj, struct dbmdata, dbmp); + GetDBM(obj, dbmp); if (dbmp->di_size < 0) { dbm = dbmp->di_dbm; diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c index 3c6452a466..e941dc878d 100644 --- a/ext/gdbm/gdbm.c +++ b/ext/gdbm/gdbm.c @@ -99,8 +99,7 @@ fgdbm_close(obj) { struct dbmdata *dbmp; - Data_Get_Struct(obj, struct dbmdata, dbmp); - if (dbmp->di_dbm == 0) closed_dbm(); + GetDBM(obj, dbmp); gdbm_close(dbmp->di_dbm); dbmp->di_dbm = 0; @@ -330,7 +329,7 @@ fgdbm_store(obj, keystr, valstr) val.dptr = RSTRING(valstr)->ptr; val.dsize = RSTRING(valstr)->len; - Data_Get_Struct(obj, struct dbmdata, dbmp); + GetDBM(obj, dbmp); dbmp->di_size = -1; dbm = dbmp->di_dbm; if (gdbm_store(dbm, key, val, GDBM_REPLACE)) { @@ -350,7 +349,7 @@ fgdbm_length(obj) GDBM_FILE dbm; int i = 0; - Data_Get_Struct(obj, struct dbmdata, dbmp); + GetDBM(obj, dbmp); if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size); dbm = dbmp->di_dbm; @@ -371,7 +370,7 @@ fgdbm_empty_p(obj) GDBM_FILE dbm; int i = 0; - Data_Get_Struct(obj, struct dbmdata, dbmp); + GetDBM(obj, dbmp); if (dbmp->di_size < 0) { dbm = dbmp->di_dbm; diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c index 5ebffcb9fd..adb1e851f7 100644 --- a/ext/sdbm/init.c +++ b/ext/sdbm/init.c @@ -95,8 +95,7 @@ fsdbm_close(obj) { struct dbmdata *dbmp; - Data_Get_Struct(obj, struct dbmdata, dbmp); - if (dbmp->di_dbm == 0) closed_sdbm(); + GetDBM(obj, dbmp); sdbm_close(dbmp->di_dbm); dbmp->di_dbm = 0; @@ -325,7 +324,7 @@ fsdbm_store(obj, keystr, valstr) val.dptr = RSTRING(valstr)->ptr; val.dsize = RSTRING(valstr)->len; - Data_Get_Struct(obj, struct dbmdata, dbmp); + GetDBM(obj, dbmp); dbmp->di_size = -1; dbm = dbmp->di_dbm; if (sdbm_store(dbm, key, val, DBM_REPLACE)) { @@ -348,7 +347,7 @@ fsdbm_length(obj) DBM *dbm; int i = 0; - Data_Get_Struct(obj, struct dbmdata, dbmp); + GetDBM(obj, dbmp); if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size); dbm = dbmp->di_dbm; @@ -369,7 +368,7 @@ fsdbm_empty_p(obj) DBM *dbm; int i = 0; - Data_Get_Struct(obj, struct dbmdata, dbmp); + GetDBM(obj, dbmp); if (dbmp->di_size < 0) { dbm = dbmp->di_dbm; @@ -741,7 +741,8 @@ rb_io_set_lineno(io, lineno) GetOpenFile(io, fptr); rb_io_check_readable(fptr); - return fptr->lineno = NUM2INT(lineno); + fptr->lineno = NUM2INT(lineno); + return lineno; } static void diff --git a/lib/parsedate.rb b/lib/parsedate.rb index 35fffcfe98..dc659200d6 100644 --- a/lib/parsedate.rb +++ b/lib/parsedate.rb @@ -67,9 +67,9 @@ module ParseDate mon = MONTHS[$2.downcase] year = $3.to_i end - if date.sub!(/\d{4}/i, ' ') + if !year && date.sub!(/\d{4}/i, ' ') year = $&.to_i - elsif date.sub!(/\d\d/i, ' ') + elsif !year && date.sub!(/\d\d/i, ' ') year = $&.to_i end if guess and year diff --git a/rubytest.rb b/rubytest.rb index b1006c420c..e9e3e7c599 100644 --- a/rubytest.rb +++ b/rubytest.rb @@ -3,7 +3,7 @@ require 'rbconfig' include Config -unless File.exist? "./#{CONFIG['ruby_install_name']}" +unless File.exist? "./#{CONFIG['ruby_install_name']}#{CONFIG['EXEEXT']}" print "./#{CONFIG['ruby_install_name']} is not found.\n" print "Try `make' first, then `make test', please.\n" exit 0 @@ -292,19 +292,16 @@ make_time_t(tptr, utc_or_local) if (!tm) goto error; if (tptr->tm_year != tm->tm_year) goto out_of_range; } - guess += (tptr->tm_mday - tm->tm_mday) * 3600 * 24; + guess += (tptr->tm_mday - tm->tm_mday) * 24 * 3600; guess += (tptr->tm_hour - tm->tm_hour) * 3600; guess += (tptr->tm_min - tm->tm_min) * 60; guess += (tptr->tm_sec - tm->tm_sec); if (guess < 0) goto out_of_range; if (!utc_or_local) { /* localtime zone adjust */ -#if defined(HAVE_DAYLIGHT) - extern int daylight; - extern long timezone; - - localtime(&guess); - guess += timezone + daylight; +#if defined(HAVE_TM_ZONE) + tm = localtime(&guess); + guess -= tm->tm_gmtoff; #else struct tm gt, lt; long tzsec; @@ -799,8 +796,14 @@ time_zone(time) time_get_tm(time, tobj->gmt); } +#if defined(HAVE_TM_ZONE) + return rb_str_new2(tobj->tm.tm_zone); +#elif defined(HAVE_TZNAME) && defined(HAVE_DAYLIGHT) + return rb_str_new2(tzname[daylight && tobj->tm.tm_isdst]); +#else len = strftime(buf, 64, "%Z", &tobj->tm); return rb_str_new(buf, len); +#endif } static VALUE @@ -1,4 +1,4 @@ -#define RUBY_VERSION "1.4.4" -#define RUBY_RELEASE_DATE "2000-06-14" -#define RUBY_VERSION_CODE 144 -#define RUBY_RELEASE_CODE 20000614 +#define RUBY_VERSION "1.4.5" +#define RUBY_RELEASE_DATE "2000-06-20" +#define RUBY_VERSION_CODE 145 +#define RUBY_RELEASE_CODE 20000620 |