Commit 1eba0880 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Fix compilation on OSX Sierra (10.12)

parent ec19ecce

configure.ac

+1 −0
Original line number Diff line number Diff line
@@ -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 \

src/common/compat_pthreads.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

src/common/crypto.c

+3 −0
Original line number Diff line number Diff line
@@ -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"