* load.c (load_lock): reverted.

* thread.c (rb_barrier_wait): check for recursive wait.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index e226a12cb..5987e07f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec 24 17:59:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (load_lock): reverted.
+
+	* thread.c (rb_barrier_wait): check for recursive wait.
+
 Mon Dec 24 17:50:54 2007  Tanaka Akira  <akr@fsij.org>
 
 	* eval.c (function_call_may_return_twice_jmp_buf): removed.