commit a633baf6320291b6f3de15557438682ed7fe2eaa Merge: 9db7bd0 39f51df Author: Nick Mathewson nickm@torproject.org Date: Sat Sep 24 13:33:09 2016 -0700
Merge branch 'osx_sierra_028'
changes/ticket20241 | 3 +++ configure.ac | 1 + src/common/compat_pthreads.c | 19 +++++++++++++------ src/common/crypto.c | 3 +++ 4 files changed, 20 insertions(+), 6 deletions(-)
diff --cc configure.ac index 4c9b1f6,a799a55..f6edb3a --- a/configure.ac +++ b/configure.ac @@@ -962,57 -943,65 +962,58 @@@ AC_SUBST(CURVE25519_LIBS dnl Make sure to enable support for large off_t if available. AC_SYS_LARGEFILE
-AC_CHECK_HEADERS( - assert.h \ - errno.h \ - fcntl.h \ - signal.h \ - string.h \ - sys/capability.h \ - sys/fcntl.h \ - sys/stat.h \ - sys/time.h \ - sys/types.h \ - time.h \ - unistd.h - , , AC_MSG_WARN(Some headers were not found, compilation may fail. If compilation succeeds, please send your orconfig.h to the developers so we can fix this warning.)) - -dnl These headers are not essential - -AC_CHECK_HEADERS( - arpa/inet.h \ - crt_externs.h \ - execinfo.h \ - grp.h \ - ifaddrs.h \ - inttypes.h \ - limits.h \ - linux/types.h \ - machine/limits.h \ - malloc.h \ - malloc/malloc.h \ - malloc_np.h \ - netdb.h \ - netinet/in.h \ - netinet/in6.h \ - pwd.h \ - readpassphrase.h \ - stdint.h \ - sys/eventfd.h \ - sys/file.h \ - sys/ioctl.h \ - sys/limits.h \ - sys/mman.h \ - sys/param.h \ - sys/prctl.h \ - sys/random.h \ - sys/resource.h \ - sys/select.h \ - sys/socket.h \ - sys/statvfs.h \ - sys/syscall.h \ - sys/sysctl.h \ - sys/syslimits.h \ - sys/time.h \ - sys/types.h \ - sys/un.h \ - sys/utime.h \ - sys/wait.h \ - syslog.h \ - utime.h -) +AC_CHECK_HEADERS([assert.h \ + errno.h \ + fcntl.h \ + signal.h \ + string.h \ + sys/capability.h \ + sys/fcntl.h \ + sys/stat.h \ + sys/time.h \ + sys/types.h \ + time.h \ + unistd.h \ + arpa/inet.h \ + crt_externs.h \ + execinfo.h \ + grp.h \ + ifaddrs.h \ + inttypes.h \ + limits.h \ + linux/types.h \ + machine/limits.h \ + malloc.h \ + malloc/malloc.h \ + malloc_np.h \ + netdb.h \ + netinet/in.h \ + netinet/in6.h \ + pwd.h \ + readpassphrase.h \ + stdint.h \ + sys/eventfd.h \ + sys/file.h \ + sys/ioctl.h \ + sys/limits.h \ + sys/mman.h \ + sys/param.h \ + sys/prctl.h \ ++ sys/random.h \ + sys/resource.h \ + sys/select.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/syscall.h \ + sys/sysctl.h \ + sys/syslimits.h \ + sys/time.h \ + sys/types.h \ + sys/un.h \ + sys/utime.h \ + sys/wait.h \ + syslog.h \ + utime.h])
AC_CHECK_HEADERS(sys/param.h)
diff --cc src/common/crypto.c index 72c1c45,f147dbd..56409b4 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@@ -67,9 -77,11 +67,12 @@@ ENABLE_GCC_WARNING(redundant-decls #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif + #ifdef HAVE_SYS_RANDOM_H + #include <sys/random.h> + #endif
#include "torlog.h" +#include "torint.h" #include "aes.h" #include "util.h" #include "container.h"