diff options
| author | Sander Vrijders <[email protected]> | 2017-03-21 16:21:25 +0100 |
|---|---|---|
| committer | Sander Vrijders <[email protected]> | 2017-03-21 16:21:25 +0100 |
| commit | 4b257b249ea91d1ee7e2341c563bac561911e8a6 (patch) | |
| tree | f45378a6118390d279062577188741ab3d256127 /src/irmd/registry.c | |
| parent | 8907220599bec8067c1701c3d8bd19f9bcb19275 (diff) | |
| parent | b04b4933fc7f03aef940b4de5fd43815834951ca (diff) | |
| download | ouroboros-4b257b249ea91d1ee7e2341c563bac561911e8a6.tar.gz ouroboros-4b257b249ea91d1ee7e2341c563bac561911e8a6.zip | |
Merge branch 'testing' into be
Diffstat (limited to 'src/irmd/registry.c')
| -rw-r--r-- | src/irmd/registry.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/irmd/registry.c b/src/irmd/registry.c index 985ecda0..9512d664 100644 --- a/src/irmd/registry.c +++ b/src/irmd/registry.c @@ -76,7 +76,7 @@ static struct reg_entry * reg_entry_init(struct reg_entry * e, if (pthread_condattr_init(&cattr)) return NULL; -#ifdef __APPLE__ +#ifndef __APPLE__ pthread_condattr_setclock(&cattr, PTHREAD_COND_CLOCK); #endif if (pthread_cond_init(&e->state_cond, &cattr)) @@ -429,7 +429,7 @@ int reg_entry_leave_state(struct reg_entry * e, if (timeout) ret = -pthread_cond_timedwait(&e->state_cond, &e->state_lock, - timeout); + &abstime); else ret = -pthread_cond_wait(&e->state_cond, &e->state_lock); @@ -468,7 +468,7 @@ int reg_entry_wait_state(struct reg_entry * e, if (timeout) ret = -pthread_cond_timedwait(&e->state_cond, &e->state_lock, - timeout); + &abstime); else ret = -pthread_cond_wait(&e->state_cond, &e->state_lock); |