tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Stop the kernel header scrubber from duplicating includes." into main

Browse source
This commit is contained in:
Treehugger Robot 2023-11-28 23:03:37 +00:00 committed by Gerrit Code Review
commit 4195a49880
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libc/kernel/tools/cpp.py
View file

@ -1202,7 +1202,7 @@ class BlockList(object):
def removeStructs(self, structs):
"""Remove structs."""
extra_includes = []
extra_includes = set()
block_num = 0
num_blocks = len(self.blocks)
while block_num < num_blocks:
@ -1248,7 +1248,7 @@ class BlockList(object):
# #include <bits/STRUCT_NAME.h>
struct_token = b.tokens[i + 1]
if not structs[struct_token.id]:
extra_includes.append("<bits/%s.h>" % struct_token.id)
extra_includes.add("<bits/%s.h>" % struct_token.id)
# Search forward for the end of the structure.
# Very simple search, look for } and ; tokens.
@ -1292,7 +1292,7 @@ class BlockList(object):
continue
i += 1
for extra_include in extra_includes:
for extra_include in sorted(extra_includes):
replacement = CppStringTokenizer(extra_include)
self.blocks.insert(2, Block(replacement.tokens, directive='include'))