issue #5570

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7022 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/ChangeLog b/ChangeLog
index 9981003..b00225a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 edc1126..9c2df34 100755 (executable)
--- 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);
                        }