Merge branch 'maint-0.3.5'

This commit is contained in:
Nick Mathewson 2018-11-06 15:17:52 -05:00
commit bcba6a4918
3 changed files with 11 additions and 0 deletions

3
changes/bug28303 Normal file
View File

@ -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.

View File

@ -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>

View File

@ -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>