ruby-changes:35786
From: nobu <ko1@a...>
Date: Fri, 10 Oct 2014 23:31:45 +0900 (JST)
Subject: [ruby-changes:35786] nobu:r47868 (trunk): thread.c: fix for older gcc
nobu 2014-10-10 23:31:37 +0900 (Fri, 10 Oct 2014) New Revision: 47868 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47868 Log: thread.c: fix for older gcc * thread.c (only_if_constant): get rid of __builtin_choose_expr() on older gcc. Modified files: trunk/thread.c Index: thread.c =================================================================== --- thread.c (revision 47867) +++ thread.c (revision 47868) @@ -145,7 +145,7 @@ static inline void blocking_region_end(r https://github.com/ruby/ruby/blob/trunk/thread.c#L145 } while(0) #ifdef __GNUC__ -#ifdef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR +#ifdef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P #define only_if_constant(expr, notconst) __builtin_choose_expr(__builtin_constant_p(expr), (expr), (notconst)) #else #define only_if_constant(expr, notconst) (__builtin_constant_p(expr) ? (expr) : (notconst)) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/