Browse Source

Merge branch 'maint-0.3.5'

Nick Mathewson 7 years ago
parent
commit
bcba6a4918
3 changed files with 11 additions and 0 deletions
  1. 3 0
      changes/bug28303
  2. 4 0
      src/lib/encoding/time_fmt.c
  3. 4 0
      src/lib/evloop/timers.c

+ 3 - 0
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.

+ 4 - 0
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>

+ 4 - 0
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>