diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 18:03:00 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-30 18:03:00 +0000 |
| commit | 22cb86722b88e807b176e2f7800b21841e115bd9 (patch) | |
| tree | dad3dc2c742cb0827fc83d09318ff035aca53b63 /include | |
| parent | f80df80d45ca54d38e00162371f87b4011d9876c (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41410 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/lock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index cf9549751..dc9cf9a28 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -485,7 +485,7 @@ static inline int __ast_cond_timedwait(const char *filename, int lineno, const c t->thread[t->reentrancy] = 0; } - if ((res = pthread_cond_timedwait(cond, &t->mutex, abstime))) { + if ((res = pthread_cond_timedwait(cond, &t->mutex, abstime)) && (res != ETIMEDOUT)) { __ast_mutex_logger("%s line %d (%s): Error waiting on condition mutex '%s'\n", filename, lineno, func, strerror(res)); #ifdef THREAD_CRASH |