commit 405fa42e8a835de394503231a85258972a65bd89 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 22 13:52:30 2018 -0400

Another windows include --- scripts/maint/checkIncludes.py | 15 ++++++++++++--- src/lib/wallclock/tm_cvt.c | 1 + 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index 3c611675e..cb3354abf 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -58,12 +58,21 @@ def load_include_rules(fname): result.addPattern(line) return result

+MDD = "--mdd" in sys.argv[1:] + +if MDD: + print( + for dirpath, dirnames, fnames in os.walk("src"): if ".may_include" in fnames: rules = load_include_rules(os.path.join(dirpath, RULES_FNAME)) - for fname in fnames: - if fname_is_c(fname): - rules.applyToFile(os.path.join(dirpath,fname)) + if MDD: + dp = dirpath.replace("src/","") + rules.dump_mdd(dp) + else: + for fname in fnames: + if fname_is_c(fname): + rules.applyToFile(os.path.join(dirpath,fname))

if trouble: err( diff --git a/src/lib/wallclock/tm_cvt.c b/src/lib/wallclock/tm_cvt.c index 63f92bff2..987b0ffeb 100644 --- a/src/lib/wallclock/tm_cvt.c +++ b/src/lib/wallclock/tm_cvt.c @@ -13,6 +13,7 @@ #include <errno.h> #include <time.h> #include <string.h> +#include <stdlib.h>

#if !defined(_WIN32) /** Defined iff we need to add locks when defining fake versions of reentrant