From 3caa1776689e108e9c701c2f52754185385368f7 Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 21 May 2016 13:47:06 +0000 Subject: * include/ruby/ruby.h (rb_scan_args): don't use ALWAYS_INLINE with `inline`. if gcc needs this duplication, do in ALWAYS_INLINE macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ include/ruby/ruby.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b9420a151e..88c21b97a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat May 21 22:45:50 2016 NAKAMURA Usaku + + * include/ruby/ruby.h (rb_scan_args): don't use ALWAYS_INLINE with + `inline`. if gcc needs this duplication, do in ALWAYS_INLINE macro. + Sat May 21 21:11:56 2016 NARUSE, Yui * include/ruby/ruby.h (rb_scan_args): use __VA_ARGS__ instead of diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 5a94e312cb..c7d700445e 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2153,7 +2153,7 @@ int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap); #define RB_NARG(...) RB_NARG0(__VA_ARGS__,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0) #define rb_scan_args(argc,argvp,fmt,...) \ rb_scan_args0(argc,argv,fmt,RB_NARG(__VA_ARGS__),(VALUE*[]){__VA_ARGS__}) -ALWAYS_INLINE(static inline int +ALWAYS_INLINE(static int rb_scan_args0(int argc, const VALUE *argv, const char *fmt, int varc, VALUE *vars[])); static inline int rb_scan_args0(int argc, const VALUE *argv, const char *fmt, int varc, VALUE *vars[]) -- cgit v1.2.3