nobu	2013-02-23 14:20:05 +0900 (Sat, 23 Feb 2013)

  New Revision: 39426

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

  Log:
    merge revision(s) 39335:
    
    * include/ruby/ruby.h (HAVE_RB_SCAN_ARGS_OPTIONAL_HASH): for
      rb_scan_args() optional hash feature.  [Bug #7861]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/include/ruby/ruby.h

Index: ruby_2_0_0/include/ruby/ruby.h
===================================================================
--- ruby_2_0_0/include/ruby/ruby.h	(revision 39425)
+++ ruby_2_0_0/include/ruby/ruby.h	(revision 39426)
@@ -1347,6 +1347,9 @@ VALUE rb_funcall_passing_block(VALUE, ID https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/include/ruby/ruby.h#L1347
 int rb_scan_args(int, const VALUE*, const char*, ...);
 VALUE rb_call_super(int, const VALUE*);
 
+/* rb_scan_args() format allows ':' for optional hash */
+#define HAVE_RB_SCAN_ARGS_OPTIONAL_HASH 1
+
 VALUE rb_gv_set(const char*, VALUE);
 VALUE rb_gv_get(const char*);
 VALUE rb_iv_get(VALUE, const char*);
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39425)
+++ ruby_2_0_0/ChangeLog	(revision 39426)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Feb 23 14:19:51 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/ruby.h (HAVE_RB_SCAN_ARGS_OPTIONAL_HASH): for
+	  rb_scan_args() optional hash feature.  [Bug #7861]
+
 Sat Feb 23 13:03:22 2013  Akinori MUSHA  <knu@i...>
 
 	* lib/ipaddr.rb (IPAddr#in6_addr): Fix a typo with the closing

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39335


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