Merge branch 'remove_unnecessary_so_far' into 'master'

Remove all unnecessary-so-far headers when test compiling

Prior to this fix, deheader would remove headers individually,
and see whether a file compiled. At the end it would remove all
headers that it identified as independently removable. However it
may be that two headers can each be independently removed, but
removing both at the same time causes a compilation failure. This
fix removes all headers identified as unnecessary-so-far for each
test compile, preventing compilation failures at the end due to
this issue.

See merge request !2

1 files changed, 1 insertions, 1 deletions

diff --git a/deheader b/deheader
index 77a997f..0d66ed4 100755
--- a/deheader
+++ b/deheader
@@ -1400,7 +1400,7 @@ def c_analyze(sourcefile, maker, includes, requires, verbosity):
                                 print "deheader: in %s, %s prevents uninclusion of %s" % (sourcefile, trigger, trim(header))
                             retain += 1
                 if not retain:
-                    saveit.remove_headers([header])
+                    saveit.remove_headers(unneeded + [header])
                     (st, _t) = testcompile(sourcefile, maker, " without %s" % trim(header), verbosity, showerrs=False)
                     if st == 0:
                         unneeded.append(header)