torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions 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
parent a5da27cb35 33b5bfb948
commit 3317cd3a1f
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/compat_pthreads.c
+2 -1
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)) {