automerge commit

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

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index f2ebdabe7e7b1a462b19ac317c1f2cb108746e71..4b000e12fdfbe5fe4c339e211cfa8aa0018e9619 100644 (file)
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -268,7 +268,7 @@ static inline int __ast_pthread_mutex_lock(const char *filename, int lineno, con
                }
        } else {
                __ast_mutex_logger("%s line %d (%s): Error obtaining mutex: %s\n",
-                                  filename, lineno, func, strerror(errno));
+                                  filename, lineno, func, strerror(res));
 #ifdef THREAD_CRASH
                DO_THREAD_CRASH;
 #endif