tor

commit a6c7e01584ae9e473e7fd9dd01d6e692a8e70e43
parent ff05162710cb514b3c0c054b034dc9c2bd66e97d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  2 Nov 2018 09:39:13 -0400

Merge branch 'bug27963_wallclock' into maint-0.3.5

Diffstat:
A
changes/bug27963_timeradd
 | 
4
++++
M
src/lib/thread/.may_include
 | 
1
+
M
src/lib/thread/compat_pthreads.c
 | 
1
+

3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/changes/bug27963_timeradd b/changes/bug27963_timeradd
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation, opensolaris):
+    - Add a missing include to compat_pthreads.c, to fix compilation
+      on OpenSolaris and its descendants. Fixes bug 27963; bugfix
+      on 0.3.5.1-alpha.
diff --git a/src/lib/thread/.may_include b/src/lib/thread/.may_include
@@ -4,3 +4,4 @@ lib/lock/*.h
 lib/log/*.h
 lib/testsupport/*.h
 lib/thread/*.h
+lib/wallclock/*.h
diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c
@@ -12,6 +12,7 @@
 
 #include "orconfig.h"
 #include "lib/thread/threads.h"
+#include "lib/wallclock/timeval.h"
 #include "lib/log/log.h"
 #include "lib/log/util_bug.h"