From d2e214736fb34b149b43435164d1e1df5a2a6762 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 2 Apr 2016 06:24:19 +0000 Subject: rb_check_arity returns argc now * include/ruby/intern.h (rb_check_arity): returns argc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ include/ruby/intern.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 154dd56c34..2c523b69fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Apr 2 15:24:18 2016 Nobuyoshi Nakada + + * include/ruby/intern.h (rb_check_arity): returns argc. + Fri Apr 1 20:58:33 2016 Martin Duerst * enc/unicode/case-folding.rb, casefold.h: Data generation to implement diff --git a/include/ruby/intern.h b/include/ruby/intern.h index 816bc7e140..e6f893ecdd 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -294,11 +294,12 @@ VALUE rb_check_funcall(VALUE, ID, int, const VALUE*); NORETURN(void rb_error_arity(int, int, int)); #define rb_check_arity rb_check_arity /* for ifdef */ -static inline void +static inline int rb_check_arity(int argc, int min, int max) { if ((argc < min) || (max != UNLIMITED_ARGUMENTS && argc > max)) rb_error_arity(argc, min, max); + return argc; } #if defined(NFDBITS) && defined(HAVE_RB_FD_INIT) -- cgit v1.2.3