ruby-changes:43066
From: nobu <ko1@a...>
Date: Tue, 24 May 2016 16:21:00 +0900 (JST)
Subject: [ruby-changes:43066] nobu:r55140 (trunk): fix __error__ and __warning__ attribute checks
nobu 2016-05-24 16:20:55 +0900 (Tue, 24 May 2016) New Revision: 55140 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55140 Log: fix __error__ and __warning__ attribute checks * configure.in (ERRORFUNC, WARNINGFUNC): __error__ and __warning__ attributes take a parenthesized string literal. Modified files: trunk/ChangeLog trunk/configure.in Index: ChangeLog =================================================================== --- ChangeLog (revision 55139) +++ ChangeLog (revision 55140) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Tue May 24 16:20:53 2016 Nobuyoshi Nakada <nobu@r...> + + * configure.in (ERRORFUNC, WARNINGFUNC): __error__ and __warning__ + attributes take a parenthesized string literal. + Tue May 24 12:35:56 2016 URABE Shyouhei <shyouhei@r...> * common.mk : sort lines, and add missing dependencies suggested Index: configure.in =================================================================== --- configure.in (revision 55139) +++ configure.in (revision 55140) @@ -1770,6 +1770,7 @@ m4_ifval([$4],${rbcv_cond+[@%:@else]} https://github.com/ruby/ruby/blob/trunk/configure.in#L1770 ${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 https://github.com/ruby/ruby/blob/trunk/configure.in#L1797 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 " https://github.com/ruby/ruby/blob/trunk/configure.in#L1808 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) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/