From: Automerge script <automerge@asterisk.org>
Date: Wed, 30 Aug 2006 18:03:00 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.12-netsec~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=008cf36d0097f8bfeeb230c41f6ab381130a970d;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

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