Merge branch 'bug27963_wallclock' into maint-0.3.5

torproject · Nov 2, 2018 · a6c7e01 · a6c7e01
2 parents ff05162 + 267b8d1
commit a6c7e01
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 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"