merges r24616 from trunk into ruby_1_9_1.

--
* thread.c (rb_check_deadlock): decrease number of sleepers before
  deadlock detection because the deadlock exception makes main thread
  run.  [ruby-dev:39142]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-10-28 14:15:54 +00:00
parent e966115c7d
commit 67b79d6c84
3 changed files with 8 additions and 1 deletions

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 300
#define RUBY_PATCHLEVEL 301
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1