From 6207ec185d6ebd0d182a50b6ce27c0bdd16e2320 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 4 Nov 2008 13:37:10 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ include/ruby/intern.h | 2 +- thread.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d38297c6..6453a4b3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Nov 4 01:56:46 2008 Nobuyoshi Nakada + + * 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 * missing.h: needs RUBY_EXTERN instead of extern for mswin. diff --git a/include/ruby/intern.h b/include/ruby/intern.h index ada1ec094..739ff1e83 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -676,7 +676,7 @@ VALUE rb_mutex_try_lock(VALUE mutex); 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); diff --git a/thread.c b/thread.c index 2407bf8d0..7e4e280f0 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); -- cgit