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

Merge branch 'maint-0.2.7'

Browse Source
This commit is contained in:
Nick Mathewson 2015-12-16 09:24:40 -05:00
commit 3317cd3a1f
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug17819 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compilation):
- Don't try to use the pthrad_condattr_setclock() function unless
it actually exists. Fixes compilation on NetBSD-6.x. Fixes bug
17819; bugfix on 0.2.6.3-alpha.

1
configure.ac
View File

@ -422,6 +422,7 @@ AC_CHECK_FUNCS(
if test "$bwin32" != true; then
AC_CHECK_HEADERS(pthread.h)
AC_CHECK_FUNCS(pthread_create)
AC_CHECK_FUNCS(pthread_condattr_setclock)
fi
if test "$bwin32" = true; then

3
src/common/compat_pthreads.c
View File

@ -185,7 +185,8 @@ tor_cond_init(tor_cond_t *cond)
return -1;
}
#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) \
&& defined(HAVE_PTHREAD_CONDATTR_SETCLOCK)
/* Use monotonic time so when we timedwait() on it, any clock adjustment
* won't affect the timeout value. */
if (pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC)) {