[asterisk-commits] russell: trunk r91827 - in /trunk: ./ include/asterisk/lock.h

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Dec  7 15:11:44 2007
New Revision: 91827

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

........
r91826 | russell | 2007-12-07 15:11:08 -0600 (Fri, 07 Dec 2007) | 6 lines

I love fixing lock related errors in the lock debugging code.  That's about as
ironic as it gets in Asterisk programming land.  Anyway, I spotted this bug while
trying to track down why systems are locking up and acting weird in issue #11080.
The mutex attribute object was marked as static in this function when it should
not have been.

........

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

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

Modified: trunk/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/lock.h?view=diff&rev=91827&r1=91826&r2=91827
==============================================================================
--- trunk/include/asterisk/lock.h (original)
+++ trunk/include/asterisk/lock.h Fri Dec  7 15:11:44 2007
@@ -187,7 +187,7 @@
 static inline void ast_reentrancy_init(ast_mutex_t *p_ast_mutex)
 {
 	int i;
-	static pthread_mutexattr_t reentr_attr;
+	pthread_mutexattr_t reentr_attr;
 
 	for (i = 0; i < AST_MAX_REENTRANCY; i++) {
 		p_ast_mutex->file[i] = NULL;