summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-22 13:52:30 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-22 13:52:30 -0400
commit405fa42e8a835de394503231a85258972a65bd89 (patch)
treeb3552b189b249ef1081d1c6060df7e9e48c663ee
parent4b32446a4c52f9ac91cf230b90ee5b72331793be (diff)
downloadtor-405fa42e8a835de394503231a85258972a65bd89.tar.gz
tor-405fa42e8a835de394503231a85258972a65bd89.zip
Another windows include
-rwxr-xr-xscripts/maint/checkIncludes.py15
-rw-r--r--src/lib/wallclock/tm_cvt.c1
2 files changed, 13 insertions, 3 deletions
diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py
index 3c611675e4..cb3354abf3 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 63f92bff24..987b0ffebf 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