From 2f11e2e4630a7770eddbce7efdd7ce9b63de5ba1 Mon Sep 17 00:00:00 2001 From: Haakon Sporsheim Date: Fri, 10 Mar 2017 11:56:45 +0100 Subject: compiler: Rename element argument of sizeof to typename. --- mesonbuild/compilers.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 65a611f03..1fb9c5ab6 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -1044,29 +1044,29 @@ class CCompiler(Compiler): raise EnvironmentException('Could not run compute_int test binary.') return int(res.stdout) - def cross_sizeof(self, element, prefix, env, extra_args=None, dependencies=None): + def cross_sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): if extra_args is None: extra_args = [] - fargs = {'prefix': prefix, 'name': element} + fargs = {'prefix': prefix, 'type': typename} t = '''#include {prefix} int main(int argc, char **argv) {{ - {name} something; + {type} something; }}''' if not self.compiles(t.format(**fargs), env, extra_args, dependencies): return -1 - return self.cross_compute_int('sizeof(%s)' % element, 1, 128, None, prefix, env, extra_args, dependencies) + return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies) - def sizeof(self, element, prefix, env, extra_args=None, dependencies=None): + def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): if extra_args is None: extra_args = [] - fargs = {'prefix': prefix, 'name': element} + fargs = {'prefix': prefix, 'type': typename} if self.is_cross: - return self.cross_sizeof(element, prefix, env, extra_args, dependencies) + return self.cross_sizeof(typename, prefix, env, extra_args, dependencies) t = '''#include {prefix} int main(int argc, char **argv) {{ - printf("%ld\\n", (long)(sizeof({name}))); + printf("%ld\\n", (long)(sizeof({type}))); return 0; }};''' res = self.run(t.format(**fargs), env, extra_args, dependencies) -- cgit v1.2.3