diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-03-28 11:05:46 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-03-28 11:05:46 +0000 |
commit | d6e2d211afaf7bc3d08a6f833fe8e20f3aa3e3f6 (patch) | |
tree | 32d67c633f166665552156bf01fa698be7535336 | |
parent | 7253910df83611f0c2aa4f6c5a5718680b9aea60 (diff) |
1.1b9_05 patches
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | ext/tcltklib/extconf.rb | 9 | ||||
-rw-r--r-- | io.c | 4 | ||||
-rw-r--r-- | string.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
5 files changed, 19 insertions, 12 deletions
@@ -1,6 +1,10 @@ -Sat Mar 28 00:47:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp> +Sat Mar 28 16:07:11 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> - * ruby.c (ruby_prog_init): `site_ruby' added to load_path. + * io.c (io_closed): should not cause exception fot closed IO. + + * string.c (str_tr): returned nil for success. + +Sat Mar 28 00:47:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp> * eval.c (f_local_variables): new method to return an array of local variable names. @@ -13,6 +17,10 @@ Sat Mar 28 00:47:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp> Fri Mar 27 13:49:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp> + * experimental release 1.1b9_05. + + * ruby.c (ruby_prog_init): `site_ruby' added to load_path. + * ruby.c (ruby_prog_init): load-path order changed. Paths in the RUBYLIB environment variable comes first in non-tainted mode. @@ -64,7 +72,7 @@ Fri Mar 20 16:40:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp> nil if it does not modify the string. * string.c (str_sub_iter_s): should check last pattern since it - may be matched to null. + may be matched to null. Thu Mar 19 13:48:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp> diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb index 8032b1357b..201070c4dd 100644 --- a/ext/tcltklib/extconf.rb +++ b/ext/tcltklib/extconf.rb @@ -40,11 +40,10 @@ search_header("tk.h", "/usr/local/include/tk*", "/usr/local/include") search_header("X11/Xlib.h", + "/usr/include/X11*", "/usr/include", - "/usr/X11*/include", - "/usr/include", - "/usr/X11*/include", - "/usr/openwin/include") + "/usr/openwin/include", + "/usr/X11*/include") $CFLAGS = "-Wall " + $includes.collect{|path| "-I" + path}.join(" ") @@ -75,7 +74,7 @@ end if have_header("tcl.h") && have_header("tk.h") && search_lib("libX11.{a,so}", "XOpenDisplay", - "/usr/lib", "/usr/X11*/lib", "/usr/openwin/lib") && + "/usr/lib", "/usr/openwin/lib", "/usr/X11*/lib") && search_lib("libtcl{,7*,8*}.{a,so}", "Tcl_FindExecutable", "/usr/lib", "/usr/local/lib") && search_lib("libtk{,4*,8*}.{a,so}", "Tk_Init", @@ -739,8 +739,8 @@ io_closed(io) { OpenFile *fptr; - GetOpenFile(io, fptr); - return fptr->f?FALSE:TRUE; + fptr = RFILE(io)->fptr; + return (fptr->f || fptr->f2)?FALSE:TRUE; } static VALUE @@ -1824,7 +1824,7 @@ str_tr(str, src, repl) VALUE val = tr_trans(str_dup(str), src, repl, 0); if (NIL_P(val)) return str; - return Qnil; + return val; } static void @@ -1,2 +1,2 @@ #define RUBY_VERSION "1.1b9_05" -#define VERSION_DATE "98/03/26" +#define VERSION_DATE "98/03/27" |