diff options
| author | Jörg Frings-Fürst <jff@merkur> | 2014-07-26 11:45:48 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <jff@merkur> | 2014-07-26 11:45:48 +0200 |
| commit | 99469e37d07b9f326c5b2c8157566f2f512cdc56 (patch) | |
| tree | 475c0ae1b3b3b8be085b54420894896688ea363c /engine/SCons/cpp.py | |
| parent | 2176ae74d2f856582dd1e498a63a31949a7e19e2 (diff) | |
| parent | 7c6b954c00c2a2eed2e975ec797216c515cd249d (diff) | |
Merge tag 'upstream/2.3.2'
Upstream version 2.3.2
Diffstat (limited to 'engine/SCons/cpp.py')
| -rw-r--r-- | engine/SCons/cpp.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/engine/SCons/cpp.py b/engine/SCons/cpp.py index a5698fd..35acf84 100644 --- a/engine/SCons/cpp.py +++ b/engine/SCons/cpp.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation +# Copyright (c) 2001 - 2014 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 2014/03/02 14:18:15 garyo" +__revision__ = "src/engine/SCons/cpp.py 2014/07/05 09:42:21 garyo" __doc__ = """ SCons C Pre-Processor module @@ -395,9 +395,10 @@ class PreProcessor(object): """ d = self.dispatch_table - d['import'] = self.do_import - d['include'] = self.do_include - d['include_next'] = self.do_include + p = self.stack[-1] if self.stack else self.default_table + + for k in ('import', 'include', 'include_next'): + d[k] = p[k] def stop_handling_includes(self, t=None): """ |