diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-21 13:47:06 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-21 13:47:06 +0000 |
| commit | f64a03489e70d5fd3754fd35400d5f7df05b1306 (patch) | |
| tree | 799bec7fef32a02b13a41af72c5502da1ea639e9 | |
| parent | 428b607ee4ebfaa9ad0fe69b47eb20f5a2acb56e (diff) | |
| download | ruby-f64a03489e70d5fd3754fd35400d5f7df05b1306.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat May 21 22:45:50 2016 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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 <naruse@ruby-lang.org> * 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[]) |