summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-10-03 08:56:50 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-10-03 08:56:50 +0000
commit1e1b5cdd25c87b393658e78a4cfd799ef6caf6da (patch)
tree8b107b0266c998b53976f4641ba30229aafd4eb7
parente07498c03f002224ca14cb55eeeaacbab300b273 (diff)
matz
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--eval.c2
-rw-r--r--ext/tcltklib/extconf.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/eval.c b/eval.c
index 833b9b0428e..de6da1d62fc 100644
--- 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
index c958755c6ef..c9082e0a7f2 100644
--- 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