diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-16 09:24:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-16 09:24:40 -0500 |
| commit | 3317cd3a1f4e3a7883bf9a5eba3f9a13097fe437 (patch) | |
| tree | c47c1c562c73ef4a22369cea373824a526b944e6 /src | |
| parent | a5da27cb35987bdab7a9ebec907056be974289a5 (diff) | |
| parent | 33b5bfb94824a55254f1ffcddf38ac17589a2744 (diff) | |
| download | tor-3317cd3a1f4e3a7883bf9a5eba3f9a13097fe437.tar.gz tor-3317cd3a1f4e3a7883bf9a5eba3f9a13097fe437.zip | |
Merge branch 'maint-0.2.7'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compat_pthreads.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index 4b32fc93d2..b1d87d38f2 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -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)) { |