summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-10 14:31:37 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-10 14:31:37 (GMT)
commitadfce27ee0c3c31fbbfe9590e877f2298b809ae0 (patch)
treeee4846341e5d66d975c80b319f4eccf628f04904 /thread.c
parent97d3b04c9b4ac50f9110001a772d59590a6f6274 (diff)
thread.c: fix for older gcc
* thread.c (only_if_constant): get rid of __builtin_choose_expr() on older gcc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/thread.c b/thread.c
index 14a4148..039b858 100644
--- a/thread.c
+++ b/thread.c
@@ -145,7 +145,7 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio
} 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))