summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-23 10:45:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-23 10:45:13 +0000
commit2d9d6caabd4b5629d4dae6bdf0f6cf5ed23ade41 (patch)
tree03f35e0c37331e10429b83224ca0bad19362317a
parent3355640a258b40cec1241c568a2c1a0b1db183af (diff)
revert error attributes
* include/ruby/ruby.h (rb_scan_args0): revert error attributes, which may not be optimized away in readline extension library. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--include/ruby/ruby.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 7e8532485ec..fbc71ddd016 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -2155,13 +2155,8 @@ int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
__builtin_choose_expr(__builtin_constant_p(fmt), \
rb_scan_args0(argc,argv,fmt,(sizeof((VALUE*[]){__VA_ARGS__})/sizeof(VALUE*)),(VALUE*[]){__VA_ARGS__}), \
rb_scan_args(argc,argvp,fmt,__VA_ARGS__))
-# if GCC_VERSION_SINCE(4, 4, 0)
-void rb_scan_args_bad_format(const char*) __attribute__((error("bad scan arg format")));
-void rb_scan_args_length_mismatch(int, int) __attribute__((error("variable argument length doesn't match")));
-# else
# define rb_scan_args_bad_format(fmt) rb_fatal("bad scan arg format: %s", fmt)
# define rb_scan_args_length_mismatch(vari, varc) rb_fatal("variable argument length doesn't match: %d %d", vari, varc)
-# endif
ALWAYS_INLINE(static int
rb_scan_args0(int argc, const VALUE *argv, const char *fmt, int varc, VALUE *vars[]));