yugui	2008-11-04 22:37:10 +0900 (Tue, 04 Nov 2008)

  New Revision: 20110

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20110

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/include/ruby/intern.h
    branches/ruby_1_9_1/thread.c

Index: ruby_1_9_1/include/ruby/intern.h
===================================================================
--- ruby_1_9_1/include/ruby/intern.h	(revision 20109)
+++ ruby_1_9_1/include/ruby/intern.h	(revision 20110)
@@ -676,7 +676,7 @@
 VALUE rb_mutex_lock(VALUE mutex);
 VALUE rb_mutex_unlock(VALUE mutex);
 VALUE rb_mutex_sleep(VALUE self, VALUE timeout);
-VALUE rb_mutex_synchronize(VALUE self);
+VALUE rb_mutex_synchronize(VALUE mutex, VALUE (*func)(VALUE arg), VALUE arg);
 VALUE rb_barrier_new(void);
 VALUE rb_barrier_wait(VALUE self);
 VALUE rb_barrier_release(VALUE self);
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20109)
+++ ruby_1_9_1/ChangeLog	(revision 20110)
@@ -1,3 +1,9 @@
+Tue Nov  4 01:56:46 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/intern.h (rb_mutex_synchronize): fixed prototype.
+
+	* thread.c (rb_mutex_synchronize): fixed function name.
+
 Mon Nov  3 16:32:54 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* missing.h: needs RUBY_EXTERN instead of extern for mswin.
Index: ruby_1_9_1/thread.c
===================================================================
--- ruby_1_9_1/thread.c	(revision 20109)
+++ ruby_1_9_1/thread.c	(revision 20110)
@@ -3023,7 +3023,7 @@
  */
 
 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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/