matz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
zsalzbank · Oct 3, 2000 · 1e1b5cd · 1e1b5cd
1 parent e07498c
commit 1e1b5cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/eval.c b/eval.c
@@ -7366,7 +7366,7 @@ rb_thread_join(thread)
 
     if (!rb_thread_dead(th)) {
 	if (th == curr_thread)
-	    rb_raise(rb_eThreadError, "recursive join");
+	    rb_raise(rb_eThreadError, "thread tried to join itself");
 	if ((th->wait_for & WAIT_JOIN) && th->join == curr_thread)
 	    rb_raise(rb_eThreadError, "Thread#join: deadlock - mutual join");
 	curr_thread->status = THREAD_STOPPED;

diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb
@@ -24,12 +24,14 @@ def find_tcl(tcllib, stubs)
     find_library(tcllib, func, *paths)
   elsif RUBY_PLATFORM =~ /mswin32|mingw|cygwin/
     find_library("tcl", func, *paths) or
+      find_library("tcl84", func, *paths) or
       find_library("tcl83", func, *paths) or
       find_library("tcl82", func, *paths) or
       find_library("tcl80", func, *paths) or
       find_library("tcl76", func, *paths)
   else
     find_library("tcl", func, *paths) or
+      find_library("tcl8.4", func, *paths) or
       find_library("tcl8.3", func, *paths) or
       find_library("tcl8.2", func, *paths) or
       find_library("tcl8.0", func, *paths) or
@@ -44,12 +46,14 @@ def find_tk(tklib, stubs)
     find_library(tklib, func, *paths)
   elsif RUBY_PLATFORM =~ /mswin32|mingw|cygwin/
     find_library("tk", func, *paths) or
+      find_library("tk84", func, *paths) or
       find_library("tk83", func, *paths) or
       find_library("tk82", func, *paths) or
       find_library("tk80", func, *paths) or
       find_library("tk42", func, *paths)
   else
     find_library("tk", func, *paths) or
+      find_library("tk8.4", func, *paths) or
       find_library("tk8.3", func, *paths) or
       find_library("tk8.2", func, *paths) or
       find_library("tk8.0", func, *paths) or