From 5b3c9fc9623feb3a94291048f64e4a8d061081b1 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 24 Apr 2017 04:20:02 +0000 Subject: [PATCH] Get rid of unnecessary GCC extension git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- gc.c | 4 ++-- parse.y | 4 ++-- thread.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gc.c b/gc.c index 6378c5d7ac..0747e880b8 100644 --- a/gc.c +++ b/gc.c @@ -893,8 +893,8 @@ static inline void gc_prof_set_heap_info(rb_objspace_t *); #define gc_prof_enabled(objspace) ((objspace)->profile.run && (objspace)->profile.current_record) #ifdef HAVE_VA_ARGS_MACRO -# define gc_report(level, objspace, fmt, ...) \ - if ((level) > RGENGC_DEBUG) {} else gc_report_body(level, objspace, fmt, ##__VA_ARGS__) +# define gc_report(level, objspace, ...) \ + if ((level) > RGENGC_DEBUG) {} else gc_report_body(level, objspace, __VA_ARGS__) #else # define gc_report if (!(RGENGC_DEBUG)) {} else gc_report_body #endif diff --git a/parse.y b/parse.y index fe366d027b..8c7cb50e75 100644 --- a/parse.y +++ b/parse.y @@ -832,14 +832,14 @@ static ID id_warn, id_warning, id_gets; # define WARN_ARGS(fmt,n) parser->value, id_warn, n, rb_usascii_str_new_lit(fmt) # define WARN_ARGS_L(l,fmt,n) WARN_ARGS(fmt,n) # ifdef HAVE_VA_ARGS_MACRO -# define WARN_CALL(args,...) rb_funcall(args,##__VA_ARGS__) +# define WARN_CALL(...) rb_funcall(__VA_ARGS__) # else # define WARN_CALL rb_funcall # endif # define WARNING_ARGS(fmt,n) parser->value, id_warning, n, rb_usascii_str_new_lit(fmt) # define WARNING_ARGS_L(l, fmt,n) WARNING_ARGS(fmt,n) # ifdef HAVE_VA_ARGS_MACRO -# define WARNING_CALL(args,...) rb_funcall(args,##__VA_ARGS__) +# define WARNING_CALL(...) rb_funcall(__VA_ARGS__) # else # define WARNING_CALL rb_funcall # endif diff --git a/thread.c b/thread.c index f97c8e355b..6ccfed0003 100644 --- a/thread.c +++ b/thread.c @@ -192,7 +192,7 @@ vm_living_thread_num(rb_vm_t *vm) #if THREAD_DEBUG #ifdef HAVE_VA_ARGS_MACRO void rb_thread_debug(const char *file, int line, const char *fmt, ...); -#define thread_debug(fmt, ...) rb_thread_debug(__FILE__, __LINE__, fmt, ##__VA_ARGS__) +#define thread_debug(...) rb_thread_debug(__FILE__, __LINE__, __VA_ARGS__) #define POSITION_FORMAT "%s:%d:" #define POSITION_ARGS ,file, line #else