diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-16 08:02:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-16 08:02:01 -0400 |
| commit | 8b3ec74e5fb1963fb42fc2fd47c373fd1cd3fd27 (patch) | |
| tree | 7349fbe5e89f5758c46e26c0b5b07f7921a395d0 | |
| parent | 11161395aff57c5aa69cda916f1ac166ee928387 (diff) | |
| parent | d3d6c595571301ac75f15e4669c567929f785051 (diff) | |
| download | tor-8b3ec74e5fb1963fb42fc2fd47c373fd1cd3fd27.tar.gz tor-8b3ec74e5fb1963fb42fc2fd47c373fd1cd3fd27.zip | |
Merge remote-tracking branch 'public/bug27990'
| -rw-r--r-- | changes/bug27990 | 3 | ||||
| -rw-r--r-- | src/lib/evloop/procmon.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug27990 b/changes/bug27990 new file mode 100644 index 0000000000..763eef2527 --- /dev/null +++ b/changes/bug27990 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, netbsd): + - Add a missing include back into procmon.c. Fixes bug 27990; + bugfix on 0.3.5.1-alpha. diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c index e0c26caab2..02e167377f 100644 --- a/src/lib/evloop/procmon.c +++ b/src/lib/evloop/procmon.c @@ -20,6 +20,9 @@ #ifdef HAVE_ERRNO_H #include <errno.h> #endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif #ifdef _WIN32 #include <winsock2.h> |