summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-04-11 18:14:19 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-04-11 18:14:56 (GMT)
commitd9a29f93cd4ff505e264974febd0566ae29880ca (patch)
tree6eea9e476374863e93c80aacb76840ac24f0c50f /3rdParty/SCons/scons-local/SCons/cpp.py
parent73f845a3f380c5a1adbac2cf29e9f36cc9b498cf (diff)
downloadswift-d9a29f93cd4ff505e264974febd0566ae29880ca.zip
swift-d9a29f93cd4ff505e264974febd0566ae29880ca.tar.bz2
Update SCons to 1.3.0.d20100404.
Diffstat (limited to '3rdParty/SCons/scons-local/SCons/cpp.py')
-rw-r--r--3rdParty/SCons/scons-local/SCons/cpp.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/3rdParty/SCons/scons-local/SCons/cpp.py b/3rdParty/SCons/scons-local/SCons/cpp.py
index 006a9b4..30227d2 100644
--- a/3rdParty/SCons/scons-local/SCons/cpp.py
+++ b/3rdParty/SCons/scons-local/SCons/cpp.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/cpp.py 4043 2009/02/23 09:06:45 scons"
+__revision__ = "src/engine/SCons/cpp.py 4761 2010/04/04 14:04:44 bdeegan"
__doc__ = """
SCons C Pre-Processor module
@@ -66,10 +66,10 @@ cpp_lines_dict = {
# 2) The optional parentheses and arguments (if it's a function-like
# macro, '' if it's not).
# 3) The expansion value.
- ('define',) : '\s+([_A-Za-z][_A-Za-z0-9_]+)(\([^)]*\))?\s*(.*)',
+ ('define',) : '\s+([_A-Za-z][_A-Za-z0-9_]*)(\([^)]*\))?\s*(.*)',
# Fetch the #undefed keyword from a #undef line.
- ('undef',) : '\s+([_A-Za-z][A-Za-z0-9_]+)',
+ ('undef',) : '\s+([_A-Za-z][A-Za-z0-9_]*)',
}
# Create a table that maps each individual C preprocessor directive to