summaryrefslogtreecommitdiff
path: root/buildtools/wafadmin
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-02-18 23:19:51 +0100
committerJelmer Vernooij <jelmer@samba.org>2012-02-18 23:19:51 +0100
commit1f29707f57db526f56d65110e12dd0ca33ee7e95 (patch)
treea15431de1ddf51aad905043e77bbed99749becc6 /buildtools/wafadmin
parent580657bc25ac5379e6a5451c1df92b33f9a8f34b (diff)
downloadsamba-1f29707f57db526f56d65110e12dd0ca33ee7e95.tar.gz
samba-1f29707f57db526f56d65110e12dd0ca33ee7e95.tar.bz2
samba-1f29707f57db526f56d65110e12dd0ca33ee7e95.zip
waf: Update to new upstream version.
Diffstat (limited to 'buildtools/wafadmin')
-rw-r--r--buildtools/wafadmin/Tools/preproc.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/buildtools/wafadmin/Tools/preproc.py b/buildtools/wafadmin/Tools/preproc.py
index 5055456054..6c49326ec3 100644
--- a/buildtools/wafadmin/Tools/preproc.py
+++ b/buildtools/wafadmin/Tools/preproc.py
@@ -555,8 +555,7 @@ def parse_char(txt):
except KeyError: raise PreprocError("could not parse char literal '%s'" % txt)
@Utils.run_once
-def tokenize(s):
- """convert a string into a list of tokens (shlex.split does not apply to c/c++/d)"""
+def tokenize_private(s):
ret = []
for match in re_clexer.finditer(s):
m = match.group
@@ -591,6 +590,10 @@ def tokenize(s):
break
return ret
+def tokenize(s):
+ """convert a string into a list of tokens (shlex.split does not apply to c/c++/d)"""
+ return tokenize_private(s)[:]
+
@Utils.run_once
def define_name(line):
return re_mac.match(line).group(0)