aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers.py
diff options
context:
space:
mode:
authorHaakon Sporsheim <haakon.sporsheim@gmail.com>2017-03-10 11:56:45 +0100
committerHaakon Sporsheim <haakon.sporsheim@gmail.com>2017-03-10 12:33:21 +0100
commit2f11e2e4630a7770eddbce7efdd7ce9b63de5ba1 (patch)
tree581ef08f743a1eac88c40b99eea510d06408de93 /mesonbuild/compilers.py
parentc9fe3a3ad4f58e2a263f8fc30c21bc009c109480 (diff)
downloadmeson-2f11e2e4630a7770eddbce7efdd7ce9b63de5ba1.zip
meson-2f11e2e4630a7770eddbce7efdd7ce9b63de5ba1.tar.gz
meson-2f11e2e4630a7770eddbce7efdd7ce9b63de5ba1.tar.bz2
compiler: Rename element argument of sizeof to typename.
Diffstat (limited to 'mesonbuild/compilers.py')
-rw-r--r--mesonbuild/compilers.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index 65a611f..1fb9c5a 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 <stdio.h>
{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<stdio.h>
{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)