From cfb4f55a7be13660377ec80fe1444c41dd4065d4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 7 Mar 2010 15:19:37 +1100 Subject: build: check size of types allow name of SIZEOF test to be specified --- buildtools/wafsamba/samba_autoconf.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py index c61a55f14b..fef44ea95b 100644 --- a/buildtools/wafsamba/samba_autoconf.py +++ b/buildtools/wafsamba/samba_autoconf.py @@ -115,7 +115,7 @@ def CHECK_FUNCS(conf, list): return ret @conf -def CHECK_SIZEOF(conf, vars, headers=None): +def CHECK_SIZEOF(conf, vars, headers=None, define=None): hdrs='' if headers is not None: hlist = to_list(headers) @@ -124,6 +124,10 @@ def CHECK_SIZEOF(conf, vars, headers=None): for h in hlist: hdrs += '#include <%s>\n' % h for v in to_list(vars): + if define is None: + define_name = 'SIZEOF_%s' % string.replace(v.upper(), ' ', '_') + else: + define_name = define conf.check(fragment= ''' %s @@ -134,7 +138,7 @@ def CHECK_SIZEOF(conf, vars, headers=None): ''' % (hdrs, v), execute=1, define_ret=True, - define_name='SIZEOF_%s' % v.upper(), + define_name=define_name, quote=False, msg="Checking size of %s" % v) -- cgit