commit bcba6a4918b43863d2ac70833aff6128231d5f22 parent 17d8ccefc0f27b0c57e501acb4f4a1a379139953 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 6 Nov 2018 15:17:52 -0500 Merge branch 'maint-0.3.5' Diffstat:
| A | changes/bug28303 | | | 3 | +++ |
| M | src/lib/encoding/time_fmt.c | | | 4 | ++++ |
| M | src/lib/evloop/timers.c | | | 4 | ++++ |
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/changes/bug28303 b/changes/bug28303 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix a pair of missing headers on OpenBSD. Fixes bug 28303; + bugfix on 0.3.5.1-alpha. Patch from Kris Katterjohn. diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c @@ -26,6 +26,10 @@ #include <string.h> #include <time.h> +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif + #ifdef _WIN32 /* For struct timeval */ #include <winsock2.h> diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c @@ -39,6 +39,10 @@ #include "lib/malloc/malloc.h" #include "lib/time/compat_time.h" +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif + #ifdef _WIN32 // For struct timeval. #include <winsock2.h>