diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-04 13:37:10 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-04 13:37:10 +0000 |
| commit | 15c15c06c15141475f54afa19d7b73d59a6c6f9b (patch) | |
| tree | cd4b12a694186eeb5ec69a12d0ba2c5cbc496953 /include | |
| parent | a1684ed7c4d959426aadcc81b1d606d17861eff8 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |