diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-07-04 20:58:53 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-07-04 20:58:53 (GMT) |
| commit | d2c1e938aecf0aa1a3729bf75cfd56458f6d7319 (patch) | |
| tree | 2e0f78f0860c3483ca93ebd0f9bd4f45ab34027f /src/engine/SCons/cpp.py | |
| parent | b82ceff0a9c3b2cdb1f67c8c56bdbbd8dad7861d (diff) | |
| download | SCons-d2c1e938aecf0aa1a3729bf75cfd56458f6d7319.zip SCons-d2c1e938aecf0aa1a3729bf75cfd56458f6d7319.tar.gz SCons-d2c1e938aecf0aa1a3729bf75cfd56458f6d7319.tar.bz2 | |
Merged in veon/scons (pull request #149).
Merged manually since original was on named branch.
Actual commit author is veon on bitbucket.
Diffstat (limited to 'src/engine/SCons/cpp.py')
| -rw-r--r-- | src/engine/SCons/cpp.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/SCons/cpp.py b/src/engine/SCons/cpp.py index 0ba10f5..60cfcea 100644 --- a/src/engine/SCons/cpp.py +++ b/src/engine/SCons/cpp.py @@ -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): """ |