From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 22 Jun 2018 17:52:30 +0000 (-0400)
Subject: Another windows include
X-Git-Tag: tor-0.3.5.1-alpha~361^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=405fa42e8a835de394503231a85258972a65bd89;p=thirdparty%2Ftor.git

Another windows include
---

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