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

matz

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2000-10-03 08:56:50 +00:00
parent e07498c03f
commit 1e1b5cdd25
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
eval.c
View file

@ -7366,7 +7366,7 @@ rb_thread_join(thread)
if (!rb_thread_dead(th)) { if (!rb_thread_dead(th)) {
if (th == curr_thread) 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) if ((th->wait_for & WAIT_JOIN) && th->join == curr_thread)
rb_raise(rb_eThreadError, "Thread#join: deadlock - mutual join"); rb_raise(rb_eThreadError, "Thread#join: deadlock - mutual join");
curr_thread->status = THREAD_STOPPED; curr_thread->status = THREAD_STOPPED;

4
ext/tcltklib/extconf.rb
View file

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