diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-24 07:20:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-24 07:20:55 +0000 |
| commit | edad4df8bb23f5a6863245d199e1c38dad977303 (patch) | |
| tree | 040459d84349492c691c642b2f68ce66c52195e0 | |
| parent | cb6c48fe16df6b25ec5681129cd148236f3e01b8 (diff) | |
| download | ruby-edad4df8bb23f5a6863245d199e1c38dad977303.tar.gz | |
fix __error__ and __warning__ attribute checks
* configure.in (ERRORFUNC, WARNINGFUNC): __error__ and __warning__
attributes take a parenthesized string literal.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue May 24 16:20:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (ERRORFUNC, WARNINGFUNC): __error__ and __warning__ + attributes take a parenthesized string literal. + Tue May 24 12:35:56 2016 URABE Shyouhei <shyouhei@ruby-lang.org> * common.mk : sort lines, and add missing dependencies suggested diff --git a/configure.in b/configure.in index 9c4cd1812a..9e630ff984 100644 --- a/configure.in +++ b/configure.in @@ -1770,6 +1770,7 @@ m4_ifval([$4],${rbcv_cond+[@%:@else]} ${rbcv_cond+[@%:@define ]attrib[](attrib_params)[ x]} ${rbcv_cond+[@%:@endif]}) $6 +@%:@define mesg ("") attrib[](attrib_params)[;], [], [rbcv="$mac"; break]) done @@ -1796,7 +1797,6 @@ AC_DEFUN([RUBY_TYPE_ATTRIBUTE], [dnl RUBY_DECL_ATTRIBUTE([$1], [$2], [$3], [$4], [type], [ @%:@define x struct conftest_attribute_check {int i;} -@%:@define mesg ("") ]) ]) @@ -1808,8 +1808,8 @@ RUBY_FUNC_ATTRIBUTE(__deprecated__("by "@%:@n), DEPRECATED_BY(n,x), rb_cv_func_d RUBY_TYPE_ATTRIBUTE(__deprecated__ mesg, DEPRECATED_TYPE(mesg,x), rb_cv_type_deprecated) RUBY_FUNC_ATTRIBUTE(__noinline__, NOINLINE) RUBY_FUNC_ATTRIBUTE(__always_inline__, ALWAYS_INLINE) -RUBY_FUNC_ATTRIBUTE(__error__, ERRORFUNC) -RUBY_FUNC_ATTRIBUTE(__warning__, WARNINGFUNC) +RUBY_FUNC_ATTRIBUTE(__error__ mesg, ERRORFUNC(mesg), rb_cv_func___error__) +RUBY_FUNC_ATTRIBUTE(__warning__ mesg, WARNINGFUNC(mesg), rb_cv_func___warning__) RUBY_FUNC_ATTRIBUTE(__weak__, WEAK, rb_cv_func_weak) if test "$rb_cv_func_weak" != x; then AC_DEFINE(HAVE_FUNC_WEAK) |