kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-08-30 18:03:00 +00:00
parent 5d95ba629c
commit 008cf36d00
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/lock.h
View File

@@ -485,7 +485,7 @@ static inline int __ast_cond_timedwait(const char *filename, int lineno, const c
t->thread[t->reentrancy] = 0; 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", __ast_mutex_logger("%s line %d (%s): Error waiting on condition mutex '%s'\n",
filename, lineno, func, strerror(res)); filename, lineno, func, strerror(res));
#ifdef THREAD_CRASH #ifdef THREAD_CRASH