nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 13:06:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on OSX Sierra (10.12)

Browse Source
This commit is contained in:
Nick Mathewson 2016-09-24 08:48:47 -07:00
parent ec19ecce4b
commit 1eba088054
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -986,6 +986,7 @@ AC_CHECK_HEADERS(
sys/mman.h \
sys/param.h \
sys/prctl.h \
sys/random.h \
sys/resource.h \
sys/select.h \
sys/socket.h \

2
src/common/compat_pthreads.c
View File

@ -247,7 +247,7 @@ tor_cond_wait(tor_cond_t *cond, tor_mutex_t *mutex, const struct timeval *tv)
return -1;
}
tvnow.tv_sec = ts.tv_sec;
tvnow.tv_usec = ts.tv_nsec / 1000;
tvnow.tv_usec = (int)(ts.tv_nsec / 1000);
timeradd(tv, &tvnow, &tvsum);
#else
if (gettimeofday(&tvnow, NULL) < 0)

3
src/common/crypto.c
View File

@ -77,6 +77,9 @@
#ifdef HAVE_SYS_SYSCALL_H
#include <sys/syscall.h>
#endif
#ifdef HAVE_SYS_RANDOM_H
#include <sys/random.h>
#endif
#include "torlog.h"
#include "aes.h"