Don't call pthread_condattr_setclock() unless it exists

Fixes bug 17819; bugfix on 0.2.6.3-alpha (specifically, d684dbb0).

diff --git a/changes/bug17819 b/changes/bug17819
new file mode 100644 (file)
index 0000000..45c55f7
--- /dev/null
+++ b/changes/bug17819
@@ -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.

diff --git a/configure.ac b/configure.ac
index d37c34daae64a62f3704ce6e5654e99edf876352..2f755683847c15905744a9e8775dcc7cdd5ec338 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -425,6 +425,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

diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c
index 4b32fc93d254f36d0246f893206d2a1898323ae6..b1d87d38f21910972ff610fe9940f4674b04c5df 100644 (file)
--- 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)) {