diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-24 00:03:21 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-24 00:03:21 +0000 |
| commit | 80293f38cd1aadb41f71627320f92083e8a9970d (patch) | |
| tree | 5df59bc1be736060ab3d66acb631ac99e450563a /include/asterisk/lock.h | |
| parent | 88ad15bc6f5270cd963ca9e9dda250997323500a (diff) | |
don't treat timeouts as errors in ast_cond_timedwait
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@14593 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/lock.h')
| -rw-r--r-- | include/asterisk/lock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index e1562e5e0..53c56a544 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -468,7 +468,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 |