merges r20102 from trunk into ruby_1_9_1.

* include/ruby/intern.h (rb_mutex_synchronize): fixed prototype.

* thread.c (rb_mutex_synchronize): fixed function name.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/thread.c b/thread.c
index 2407bf8d07..7e4e280f06 100644
--- a/thread.c
+++ b/thread.c
@@ -3023,7 +3023,7 @@ mutex_sleep(int argc, VALUE *argv, VALUE self)
  */
 
 VALUE
-rb_thread_synchronize(VALUE mutex, VALUE (*func)(VALUE arg), VALUE arg)
+rb_mutex_synchronize(VALUE mutex, VALUE (*func)(VALUE arg), VALUE arg)
 {
     rb_mutex_lock(mutex);
     return rb_ensure(func, arg, rb_mutex_unlock, mutex);