From 008cf36d0097f8bfeeb230c41f6ab381130a970d Mon Sep 17 00:00:00 2001 From: Automerge script Date: Wed, 30 Aug 2006 18:03:00 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41410 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/lock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index cf9549751b..dc9cf9a280 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