diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-02 09:39:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-02 09:39:13 -0400 |
| commit | a6c7e01584ae9e473e7fd9dd01d6e692a8e70e43 (patch) | |
| tree | 5f599471f8a275b7fcb7fe0a7a644586cd1e4467 | |
| parent | ff05162710cb514b3c0c054b034dc9c2bd66e97d (diff) | |
| parent | 267b8d16b1fdc4e4730893aeee26e4dded97ad2d (diff) | |
| download | tor-a6c7e01584ae9e473e7fd9dd01d6e692a8e70e43.tar.gz tor-a6c7e01584ae9e473e7fd9dd01d6e692a8e70e43.zip | |
Merge branch 'bug27963_wallclock' into maint-0.3.5
| -rw-r--r-- | changes/bug27963_timeradd | 4 | ||||
| -rw-r--r-- | src/lib/thread/.may_include | 1 | ||||
| -rw-r--r-- | src/lib/thread/compat_pthreads.c | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug27963_timeradd b/changes/bug27963_timeradd new file mode 100644 index 0000000000..34b361cf8d --- /dev/null +++ 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 index 93ad0cd734..fc56f46836 100644 --- 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 index 934067e4c1..e5c8805ddc 100644 --- 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" |