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 | |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | include/ruby/intern.h | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Mar 5 22:54:36 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> + + * include/ruby/intern.h: fix a typo of prototype declaration. + rb_mutex_try_lock -> rb_mutex_trylock [ruby-dev:43213] + Thu Mar 3 21:21:42 2011 NAKAMURA Usaku <usa@ruby-lang.org> * test/ruby/test_process.rb (test_execopts_redirect): redirecting fd 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); @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 210 +#define RUBY_PATCHLEVEL 211 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |