diff options
author | Luiz Otavio O Souza <luiz@netgate.com> | 2017-02-09 12:56:45 -0600 |
---|---|---|
committer | Luiz Otavio O Souza <luiz@netgate.com> | 2017-02-09 12:56:45 -0600 |
commit | 91168d55b893d0ff41403098765ffb6a890805a0 (patch) | |
tree | 429fd0d8430d5b8140c527d92b60fbb3fe2e2278 /contrib/netbsd-tests/lib/libpthread/t_condwait.c | |
parent | ac4b1285e0aabc7a59f32412b4f2ca7674c5458f (diff) | |
parent | 9077a30ba0ad5458cceb3d0418b2f1ea7f70d556 (diff) | |
download | FreeBSD-src-91168d55b893d0ff41403098765ffb6a890805a0.zip FreeBSD-src-91168d55b893d0ff41403098765ffb6a890805a0.tar.gz |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'contrib/netbsd-tests/lib/libpthread/t_condwait.c')
-rw-r--r-- | contrib/netbsd-tests/lib/libpthread/t_condwait.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/contrib/netbsd-tests/lib/libpthread/t_condwait.c b/contrib/netbsd-tests/lib/libpthread/t_condwait.c index 17bbb89..99793d0 100644 --- a/contrib/netbsd-tests/lib/libpthread/t_condwait.c +++ b/contrib/netbsd-tests/lib/libpthread/t_condwait.c @@ -42,6 +42,8 @@ __RCSID("$NetBSD: t_condwait.c,v 1.4 2013/04/12 17:18:11 christos Exp $"); #ifdef __FreeBSD__ #include <sys/time.h> + +#include "h_common.h" #endif #define WAITTIME 2 /* Timeout wait secound */ @@ -60,8 +62,13 @@ run(void *param) clck = *(clockid_t *)param; +#ifdef __FreeBSD__ + PTHREAD_REQUIRE(pthread_condattr_init(&attr)); + PTHREAD_REQUIRE(pthread_condattr_setclock(&attr, clck)); +#else pthread_condattr_init(&attr); pthread_condattr_setclock(&attr, clck); /* MONOTONIC or MONOTONIC */ +#endif pthread_cond_init(&cond, &attr); ATF_REQUIRE_EQ((ret = pthread_mutex_lock(&m)), 0); |