diff options
| -rwxr-xr-x | ChangeLog | 4 | ||||
| -rwxr-xr-x | include/asterisk/lock.h | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2005-11-07 Kevin P. Fleming <kpfleming@digium.com> + + * include/asterisk/lock.h (__ast_pthread_mutex_lock): correct build with DETECT_DEADLOCKS defined (issue #5570) + 2005-11-07 Russell Bryant <russell@digium.com> * include/asterisk/app.h: Increment the arg_index in the options structure to fix applicaiton options that have arguments to them diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index edc112698..9c2df3487 100755 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -235,7 +235,8 @@ static inline int __ast_pthread_mutex_lock(const char *filename, int lineno, con __ast_mutex_logger("%s line %d (%s): Deadlock? waited %d sec for mutex '%s'?\n", filename, lineno, func, (int)(current - seconds), mutex_name); __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", - t->file, t->lineno, t->func, mutex_name); + t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], + t->func[t->reentrancy-1], mutex_name); } usleep(200); } |