summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-18 15:39:14 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-18 15:39:14 +1000
commit8dc2db0f6d61fc26fbecd27afbee5147ad358756 (patch)
tree0c5c2d8739d516df7718dbe1932525a73f28776b
parent77768dbd75d0f4b41c41d7b2fc86a2994636635a (diff)
downloadsamba-8dc2db0f6d61fc26fbecd27afbee5147ad358756.tar.gz
samba-8dc2db0f6d61fc26fbecd27afbee5147ad358756.tar.bz2
samba-8dc2db0f6d61fc26fbecd27afbee5147ad358756.zip
build: added abi type maps for _Bool and __va_list_tag
This allows us to make the signature files platform independent
-rw-r--r--buildtools/wafsamba/samba_abi.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 6e4d8d81e0..2b6871a7ee 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -3,12 +3,22 @@
import Options, Utils, os, Logs, samba_utils, sys, Task, fnmatch, re
from TaskGen import feature, before, after
+# these type maps cope with platform specific names for common types
+# please add new type mappings into the list below
+abi_type_maps = {
+ '_Bool' : 'bool',
+ '__va_list_tag' : 'va_list'
+ }
+
def normalise_signature(sig):
'''normalise a signature from gdb'''
sig = sig.strip()
sig = re.sub('^\$[0-9]+\s=\s\{*', '', sig)
sig = re.sub('\}(\s0x[0-9a-f]+\s<\w+>)?$', '', sig)
sig = re.sub('0x[0-9a-f]+', '0xXXXX', sig)
+
+ for t in abi_type_maps:
+ sig = re.sub('\\b%s\\b' % t, abi_type_maps[t], sig)
return sig
def normalise_varargs(sig):