[asterisk-commits] tilghman: trunk r76940 - in /trunk: ./ include/asterisk/lock.h

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jul 24 17:13:37 2007
New Revision: 76940

URL: http://svn.digium.com/view/asterisk?view=rev&rev=76940
Log:
Merged revisions 76937 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r76937 | tilghman | 2007-07-24 17:12:43 -0500 (Tue, 24 Jul 2007) | 10 lines

Merged revisions 76934 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r76934 | tilghman | 2007-07-24 17:11:33 -0500 (Tue, 24 Jul 2007) | 2 lines

Oops, res contains the error code, not errno.  I was wondering why a mutex was reporting "No such file or directory"...

........

................

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/lock.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Jul 24 17:13:37 2007
@@ -1,1 +1,1 @@
-menuselect	https://origsvn.digium.com/svn/menuselect/branches/1.0
+menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0

Modified: trunk/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/lock.h?view=diff&rev=76940&r1=76939&r2=76940
==============================================================================
--- trunk/include/asterisk/lock.h (original)
+++ trunk/include/asterisk/lock.h Tue Jul 24 17:13:37 2007
@@ -273,7 +273,7 @@
 		}
 	} else {
 		__ast_mutex_logger("%s line %d (%s): Error obtaining mutex: %s\n",
-				   filename, lineno, func, strerror(errno));
+				   filename, lineno, func, strerror(res));
 		DO_THREAD_CRASH;
 	}