From 13617841625181fed57560d56fbb05326f5ec22e Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 12 Mar 2017 07:46:13 +0000 Subject: 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57896 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/ruby.h | 6 +++--- version.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 06524c116d..6144c67234 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2326,17 +2326,17 @@ rb_scan_args_end_idx(const char *fmt) 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; diff --git a/version.h b/version.h index a4b79538da..98974ea726 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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 -- cgit v1.2.3