From: Automerge Script Date: Tue, 24 Jul 2007 22:22:33 +0000 (+0000) Subject: automerge commit X-Git-Tag: 1.2.24-netsec~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=611c08e453739ef9cef72e5d79e484d2d989154a;p=thirdparty%2Fasterisk.git 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 f2ebdabe7e..4b000e12fd 100644 --- 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