From: Dale Weiler Date: Wed, 28 Aug 2013 17:01:46 +0000 (-0400) Subject: Fix build on clang X-Git-Tag: 0.3.5~122 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ceb79f1897fabed29583f23dd54cbef0e7897217;p=xonotic%2Fgmqcc.git Fix build on clang --- diff --git a/parser.c b/parser.c index 8c585f5..ef20655 100644 --- a/parser.c +++ b/parser.c @@ -1187,13 +1187,13 @@ static bool parser_close_call(parser_t *parser, shunt *sy) * intrinsic call and just evaluate it i.e constant fold it. */ if (fold && ast_istype(fun, ast_value) && ((ast_value*)fun)->intrinsic) { - ast_expression **exprs = NULL; - ast_expression *fold = NULL; + ast_expression **exprs = NULL; + ast_expression *foldval = NULL; for (i = 0; i < paramcount; i++) vec_push(exprs, sy->out[fid+1 + i].out); - if (!(fold = intrin_fold(parser->intrin, (ast_value*)fun, exprs))) { + if (!(foldval = intrin_fold(parser->intrin, (ast_value*)fun, exprs))) { vec_free(exprs); goto fold_leave; } @@ -1202,7 +1202,7 @@ static bool parser_close_call(parser_t *parser, shunt *sy) * Blub: what sorts of unreffing and resizing of * sy->out should I be doing here? */ - sy->out[fid] = syexp(fold->node.context, fold); + sy->out[fid] = syexp(foldval->node.context, foldval); vec_shrinkby(sy->out, 1); vec_free(exprs);