Author: stefan2
Date: Tue Jul 30 14:20:32 2013
New Revision: 1508458
URL: http://svn.apache.org/r1508458
Log:
Follow-up to r1508221.
* build/ac-macros/svn-macros.m4
(SVN_CHECK_FOR_DUNDER_BUILTINS): make the cross-compile case match the
standard check
* configure.ac
(SVN_CHECK_FOR_DUNDER_BUILTINS): update comment
Found by: danielsh
Modified:
subversion/trunk/build/ac-macros/svn-macros.m4
subversion/trunk/configure.ac
Modified: subversion/trunk/build/ac-macros/svn-macros.m4
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/svn-macros.m4?rev=1508458&r1=1508457&r2=1508458&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/svn-macros.m4 (original)
+++ subversion/trunk/build/ac-macros/svn-macros.m4 Tue Jul 30 14:20:32 2013
@@ -178,7 +178,7 @@ AC_DEFUN([SVN_CHECK_FOR_DUNDER_BUILTINS]
svn_cv_dunder_builtins="no",
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
int main(void){
- return __builtin_choose_expr(__builtin_constant_p("foobar"), 0, 1);
+ return __builtin_constant_p("foobar") ? 0 : 1;
}]])],
svn_cv_dunder_builtins="yes",
svn_cv_dunder_builtins="no")
Modified: subversion/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1508458&r1=1508457&r2=1508458&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Tue Jul 30 14:20:32 2013
@@ -173,7 +173,7 @@ fi
SVN_CHECK_FOR_DUNDER_BUILTINS
if test "$svn_cv_dunder_builtins" = "yes"; then
- AC_DEFINE(SVN_HAS_DUNDER_BUILTINS, 1, [Define if compiler provides
__builtin_constant_p and __builtin_choose_expr])
+ AC_DEFINE(SVN_HAS_DUNDER_BUILTINS, 1, [Define if compiler provides
__builtin_constant_p])
fi
dnl Set up a number of directories ---------------------
