mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge branch 'maint-0.3.5'
This commit is contained in:
commit
bcba6a4918
3
changes/bug28303
Normal file
3
changes/bug28303
Normal 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.
|
@ -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>
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user