From 47c3a26915ffa12b3a9a14a3da485c1a0d5ab32c Mon Sep 17 00:00:00 2001 From: Christoph Behle Date: Mon, 11 Jun 2018 19:57:34 +0200 Subject: Always apply concatenate_string_literal. get_define always applies concatenate_string_literal to its result. Remove kwarg concatenate_string_literal from get_define. --- mesonbuild/compilers/c.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/compilers') diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index e34779b..ef67e03 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -569,7 +569,7 @@ class CCompiler(Compiler): # Get the preprocessed value after the delimiter, # minus the extra newline at the end and # merge string literals. - return p.stdo.split(delim + '\n')[-1][:-1] + return CCompiler.concatenate_string_literals(p.stdo.split(delim + '\n')[-1][:-1]) def get_return_value(self, fname, rtype, prefix, env, extra_args, dependencies): if rtype == 'string': -- cgit v1.1