diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-28 23:32:01 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-28 23:32:01 +0000 |
| commit | fee12c7fa50b623a322bd1fe24e9d6aababd08a1 (patch) | |
| tree | afae9b2b7bf0d0b9b78fd82050885b413137fbb1 /include | |
| parent | ce79ff70cd94a0223bf407423741ee5546d803ae (diff) | |
merges r31028 from trunk into ruby_1_9_2.
--
* include/ruby/intern.h: fix a typo of prototype declaration.
rb_mutex_try_lock -> rb_mutex_trylock [ruby-dev:43213]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31772 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 af97c2a9b8..0f1081715d 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -761,7 +761,7 @@ VALUE rb_thread_blocking_region(rb_blocking_function_t *func, void *data1, #define RUBY_UBF_PROCESS ((rb_unblock_function_t *)-1) VALUE rb_mutex_new(void); VALUE rb_mutex_locked_p(VALUE mutex); -VALUE rb_mutex_try_lock(VALUE mutex); +VALUE rb_mutex_trylock(VALUE mutex); VALUE rb_mutex_lock(VALUE mutex); VALUE rb_mutex_unlock(VALUE mutex); VALUE rb_mutex_sleep(VALUE self, VALUE timeout); |