From 88a4f331219ae0cb25afb70f2c32c8c000aba750 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 3 Nov 2008 16:56:49 +0000 Subject: [PATCH] * 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/trunk@20102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ include/ruby/intern.h | 2 +- thread.c | 2 +- version.h | 6 +++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea776b2f5a..7cb41e5716 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 ada1ec0944..739ff1e834 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 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); diff --git a/version.h b/version.h index 5f5b18bd6e..e9036c7e5f 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-11-03" +#define RUBY_RELEASE_DATE "2008-11-04" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20081103 +#define RUBY_RELEASE_CODE 20081104 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 4 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];