1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

1.1b9_05 patches

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 1998-03-28 11:05:46 +00:00
parent 7253910df8
commit d6e2d211af
5 changed files with 19 additions and 12 deletions

View file

@ -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 * eval.c (f_local_variables): new method to return an array of
local variable names. 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> 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 * ruby.c (ruby_prog_init): load-path order changed. Paths in
the RUBYLIB environment variable comes first in non-tainted the RUBYLIB environment variable comes first in non-tainted
mode. mode.

View file

@ -40,11 +40,10 @@ search_header("tk.h",
"/usr/local/include/tk*", "/usr/local/include/tk*",
"/usr/local/include") "/usr/local/include")
search_header("X11/Xlib.h", search_header("X11/Xlib.h",
"/usr/include/X11*",
"/usr/include", "/usr/include",
"/usr/X11*/include", "/usr/openwin/include",
"/usr/include", "/usr/X11*/include")
"/usr/X11*/include",
"/usr/openwin/include")
$CFLAGS = "-Wall " + $includes.collect{|path| "-I" + path}.join(" ") $CFLAGS = "-Wall " + $includes.collect{|path| "-I" + path}.join(" ")
@ -75,7 +74,7 @@ end
if have_header("tcl.h") && have_header("tk.h") && if have_header("tcl.h") && have_header("tk.h") &&
search_lib("libX11.{a,so}", "XOpenDisplay", 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", search_lib("libtcl{,7*,8*}.{a,so}", "Tcl_FindExecutable",
"/usr/lib", "/usr/local/lib") && "/usr/lib", "/usr/local/lib") &&
search_lib("libtk{,4*,8*}.{a,so}", "Tk_Init", search_lib("libtk{,4*,8*}.{a,so}", "Tk_Init",

4
io.c
View file

@ -739,8 +739,8 @@ io_closed(io)
{ {
OpenFile *fptr; OpenFile *fptr;
GetOpenFile(io, fptr); fptr = RFILE(io)->fptr;
return fptr->f?FALSE:TRUE; return (fptr->f || fptr->f2)?FALSE:TRUE;
} }
static VALUE static VALUE

View file

@ -1824,7 +1824,7 @@ str_tr(str, src, repl)
VALUE val = tr_trans(str_dup(str), src, repl, 0); VALUE val = tr_trans(str_dup(str), src, repl, 0);
if (NIL_P(val)) return str; if (NIL_P(val)) return str;
return Qnil; return val;
} }
static void static void

View file

@ -1,2 +1,2 @@
#define RUBY_VERSION "1.1b9_05" #define RUBY_VERSION "1.1b9_05"
#define VERSION_DATE "98/03/26" #define VERSION_DATE "98/03/27"