diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-02 06:41:45 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-01-02 06:41:45 +0000 |
| commit | 67b547d06a35d928113fc66208a6310f335e6935 (patch) | |
| tree | daaaae93adf3a5cc45d06e25ab17166a79373b53 | |
| parent | ef19834ed927293738b648b15c084ca0d0f52dad (diff) | |
__VA_ARGS__ is a C99ism
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | include/ruby/ruby.h | 4 | ||||
| -rw-r--r-- | internal.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 7c1b909113..07e8f71311 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2172,7 +2172,7 @@ unsigned long ruby_strtoul(const char *str, char **endptr, int base); PRINTF_ARGS(int ruby_snprintf(char *str, size_t n, char const *fmt, ...), 3, 4); int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap); -#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && defined(__OPTIMIZE__) +#if defined(HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P) && defined(HAVE_VA_ARGS_MACRO) && defined(__OPTIMIZE__) # define rb_scan_args(argc,argvp,fmt,...) \ __builtin_choose_expr(__builtin_constant_p(fmt), \ rb_scan_args0(argc,argvp,fmt,\ @@ -2448,7 +2448,7 @@ rb_scan_args_set(int argc, const VALUE *argv, } #endif -#if defined(__GNUC__) && defined(__OPTIMIZE__) +#if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO) && defined(__OPTIMIZE__) # define rb_yield_values(argc, ...) \ __extension__({ \ const int rb_yield_values_argc = (argc); \ diff --git a/internal.h b/internal.h index 4b4dace768..94c8f3ff67 100644 --- a/internal.h +++ b/internal.h @@ -1053,7 +1053,7 @@ VALUE rb_ary_aref1(VALUE ary, VALUE i); VALUE rb_ary_aref2(VALUE ary, VALUE b, VALUE e); size_t rb_ary_memsize(VALUE); VALUE rb_to_array_type(VALUE obj); -#ifdef __GNUC__ +#if defined(__GNUC__) && defined(HAVE_VA_ARGS_MACRO) #define rb_ary_new_from_args(n, ...) \ __extension__ ({ \ const VALUE args_to_new_ary[] = {__VA_ARGS__}; \ |