diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-06 15:17:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-06 15:17:52 -0500 |
| commit | bcba6a4918b43863d2ac70833aff6128231d5f22 (patch) | |
| tree | f428c192fdaa999fc98708980b8b3af41486c463 | |
| parent | 17d8ccefc0f27b0c57e501acb4f4a1a379139953 (diff) | |
| parent | 67abf55d6b2d2c10a1e666e0295d40890935f304 (diff) | |
| download | tor-bcba6a4918b43863d2ac70833aff6128231d5f22.tar.gz tor-bcba6a4918b43863d2ac70833aff6128231d5f22.zip | |
Merge branch 'maint-0.3.5'
| -rw-r--r-- | changes/bug28303 | 3 | ||||
| -rw-r--r-- | src/lib/encoding/time_fmt.c | 4 | ||||
| -rw-r--r-- | src/lib/evloop/timers.c | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/changes/bug28303 b/changes/bug28303 new file mode 100644 index 0000000000..80f1302e5e --- /dev/null +++ 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 index a921fc681c..233d0dddff 100644 --- 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 index c4e85c7c93..3603bf1a7d 100644 --- 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> |