yugui	2011-05-29 08:32:01 +0900 (Sun, 29 May 2011)

  New Revision: 31772

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31772

  Log:
    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]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/include/ruby/intern.h
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/include/ruby/intern.h
===================================================================
--- ruby_1_9_2/include/ruby/intern.h	(revision 31771)
+++ ruby_1_9_2/include/ruby/intern.h	(revision 31772)
@@ -761,7 +761,7 @@
 #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);
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31771)
+++ ruby_1_9_2/ChangeLog	(revision 31772)
@@ -1,3 +1,8 @@
+Sat Mar  5 22:54:36 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* 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@r...>
 
 	* test/ruby/test_process.rb (test_execopts_redirect): redirecting fd
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31771)
+++ ruby_1_9_2/version.h	(revision 31772)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/