diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-07-14 19:43:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-07-14 19:43:52 +0300 |
commit | 5df517b2f4fc1a58853250c65cbd12ae5dec8c52 (patch) | |
tree | 63d33beaed454d097c5e3505a3a7de9171a040ea | |
parent | f0b2a509dc2fff5916e54fc2c6af68b44bbacfee (diff) | |
download | deheader-5df517b2f4fc1a58853250c65cbd12ae5dec8c52.tar.gz deheader-5df517b2f4fc1a58853250c65cbd12ae5dec8c52.tar.bz2 deheader-5df517b2f4fc1a58853250c65cbd12ae5dec8c52.tar.xz deheader-5df517b2f4fc1a58853250c65cbd12ae5dec8c52.zip |
Revert "Dont send defines in std2 parameter into check_block."
This reverts commit f0b2a509dc2fff5916e54fc2c6af68b44bbacfee.
-rwxr-xr-x | deheader | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1283,7 +1283,7 @@ class InclusionMap: c = match_preproc(["ifndef", "ifdef", "if", "elif"], line) if c is not False: if allow_parse_includes == True: - allow_parse_includes = self.check_block(sourcefile, cnt, compiler, "", defines + " " + std, std2, maker, verbosity, showerrs, subdir) + allow_parse_includes = self.check_block(sourcefile, cnt, compiler, "", defines + " " + std, defines + " " + std2, maker, verbosity, showerrs, subdir) conditions.append((c, allow_parse_includes)) elif match_preproc("else", line) is not False: if self.get_prev_flag(conditions, 2) == True: |