naruse	2017-03-12 16:46:13 +0900 (Sun, 12 Mar 2017)

  New Revision: 57896

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57896

  Log:
    merge revision(s) 57520: [Backport #13184]
    
    ruby.h: unused parameter
    
    * include/ruby/ruby.h (rb_scan_args_set): remove unused parameter
      for more pedantic extension libraries.
      [ruby-core:79399] [Feature #13184]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/include/ruby/ruby.h
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57895)
+++ ruby_2_4/version.h	(revision 57896)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 53
+#define RUBY_PATCHLEVEL 54
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/include/ruby/ruby.h
===================================================================
--- ruby_2_4/include/ruby/ruby.h	(revision 57895)
+++ ruby_2_4/include/ruby/ruby.h	(revision 57896)
@@ -2326,17 +2326,17 @@ rb_scan_args_end_idx(const char *fmt) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/include/ruby/ruby.h#L2326
 		     rb_scan_args_f_var(fmt), \
 		     rb_scan_args_f_hash(fmt), \
 		     rb_scan_args_f_block(fmt), \
-		     rb_scan_args_verify(fmt, varc), vars)
+		     (rb_scan_args_verify(fmt, varc), vars))
 ALWAYS_INLINE(static int
 rb_scan_args_set(int argc, const VALUE *argv,
 		 int n_lead, int n_opt, int n_trail,
 		 int f_var, int f_hash, int f_block,
-		 int varc, VALUE *vars[]));
+		 VALUE *vars[]));
 inline int
 rb_scan_args_set(int argc, const VALUE *argv,
 		 int n_lead, int n_opt, int n_trail,
 		 int f_var, int f_hash, int f_block,
-		 int varc, VALUE *vars[])
+		 VALUE *vars[])
 {
     int i, argi = 0, vari = 0;
     VALUE *var, hash = Qnil;

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57520


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