diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-04-14 09:08:16 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-04-14 09:08:16 +0000 |
commit | e0041160736f1c0f092400eb75336311ab10fa1e (patch) | |
tree | 8e1eff7442eff1dbc00d1e88d97066d4b5a4e65c | |
parent | a1a693e138392467ca74fb4ba5b071dd7675960e (diff) |
1.1b9_10 tobe
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | array.c | 2 | ||||
-rw-r--r-- | ext/extmk.rb.in | 29 | ||||
-rw-r--r-- | version.h | 4 |
4 files changed, 32 insertions, 11 deletions
@@ -1,5 +1,9 @@ Tue Apr 14 11:34:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp> + * experimental release 1.1b9_10. + + * parse.y: token names prefixed by `t'. + * struct.c (struct_s_def): supports subclassing of Struct. * io.c (io_s_new): supports subclassing of IO. @@ -18,11 +22,11 @@ Mon Apr 13 11:07:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp> Mon Apr 13 13:18:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp> - * eval.c (thread_trap_eval): all handlers executed under main_thread. + * eval.c (thread_trap_eval): all signals delivered to main_thread. Mon Apr 13 12:47:03 1998 TAKAHASHI Masayoshi <maki@inac.co.jp> - * re.c (kcode_set_option): did not SJIS on SJIS condition. + * re.c (kcode_set_option): did not set SJIS on SJIS condition. Sun Apr 12 22:14:07 1998 Kazunori NISHI <kazunori@swlab.csce.kyushu-u.ac.jp> @@ -1300,8 +1300,8 @@ Init_Array() rb_define_method(cArray, "&", ary_and, 1); rb_define_method(cArray, "|", ary_or, 1); - rb_define_method(cArray, "uniq!", ary_uniq_bang, 0); rb_define_method(cArray, "uniq", ary_uniq, 0); + rb_define_method(cArray, "uniq!", ary_uniq_bang, 0); rb_define_method(cArray, "compact", ary_compact, 0); rb_define_method(cArray, "compact!", ary_compact_bang, 0); rb_define_method(cArray, "nitems", ary_nitems, 0); diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 9c6f3f50e2..8fa333cf68 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -59,20 +59,37 @@ end if PLATFORM == "m68k-human" CFLAGS = "@CFLAGS@".gsub(/-c..-stack=[0-9]+ */, '') -LINK = "@CC@ -o conftest -I#{$topdir} " + CFLAGS + " %s @LDFLAGS@ %s conftest.c @LIBS@ %s > nul 2>&1" -CPP = "@CPP@ @CPPFLAGS@ -I#{$topdir} " + CFLAGS + " %s conftest.c > nul 2>&1" +LINK = "@CC@ -o conftest -I#{$topdir} " + CFLAGS + " %s @LDFLAGS@ %s conftest.c @LIBS@ %s" +CPP = "@CPP@ @CPPFLAGS@ -I#{$topdir} " + CFLAGS + " %s conftest.c" else CFLAGS = "@CFLAGS@" -LINK = "@CC@ -o conftest -I#{$topdir} " + CFLAGS + " %s @LDFLAGS@ %s conftest.c %s > /dev/null 2>&1" -CPP = "@CPP@ @CPPFLAGS@ -I#{$topdir} " + CFLAGS + " %s conftest.c > /dev/null 2>&1" +LINK = "@CC@ -o conftest -I#{$topdir} " + CFLAGS + " %s @LDFLAGS@ %s conftest.c %s" +CPP = "@CPP@ @CPPFLAGS@ -I#{$topdir} " + CFLAGS + " %s conftest.c" +end + +if /win32|djgpp|mingw32/i =~ PLATFORM + $null = open("nul", "w") +else + $null = open("/dev/null", "w") +end + +$orgerr = $stderr.dup +$orgout = $stdout.dup +def xsystem command + $stderr.reopen($null) + $stdout.reopen($null) + r = system(command) + $stderr.reopen($orgerr) + $stdout.reopen($orgout) + return r end def try_link(libs) - system(format(LINK, $CFLAGS, $LDFLAGS, libs)) + xsystem(format(LINK, $CFLAGS, $LDFLAGS, libs)) end def try_cpp - system(format(CPP, $CFLAGS)) + xsystem(format(CPP, $CFLAGS)) end def have_library(lib, func) @@ -1,2 +1,2 @@ -#define RUBY_VERSION "1.1b9_09" -#define VERSION_DATE "98/04/09" +#define RUBY_VERSION "1.1b9_10" +#define VERSION_DATE "98/04/14" |