commit 8b3ec74e5fb1963fb42fc2fd47c373fd1cd3fd27 parent 11161395aff57c5aa69cda916f1ac166ee928387 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 16 Oct 2018 08:02:01 -0400 Merge remote-tracking branch 'public/bug27990' Diffstat:
| A | changes/bug27990 | | | 3 | +++ |
| M | src/lib/evloop/procmon.c | | | 3 | +++ |
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/changes/bug27990 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 @@ -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>