From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 18 Feb 2012 22:19:51 +0000 (+0100)
Subject: waf: Update to new upstream version.
X-Git-Tag: samba-4.0.0alpha18~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f29707f57db526f56d65110e12dd0ca33ee7e95;p=thirdparty%2Fsamba.git

waf: Update to new upstream version.
---

diff --git a/buildtools/wafadmin/Tools/preproc.py b/buildtools/wafadmin/Tools/preproc.py
index 5055456054b..6c49326ec3e 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)