[asterisk-commits] kpfleming: trunk r43488 - in /trunk: ./ main/channel.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Sep 22 11:25:04 2006
New Revision: 43488

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

........
r43486 | kpfleming | 2006-09-22 10:51:13 -0500 (Fri, 22 Sep 2006) | 2 lines

all the Linux systems I have don't use '__m_count' for this field, so I don't know where this came from...

........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Fri Sep 22 11:25:04 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482
+/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?rev=43488&r1=43487&r2=43488&view=diff
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Fri Sep 22 11:25:04 2006
@@ -4445,9 +4445,9 @@
 #ifdef __linux__
 		int count = 0;
 #ifdef DEBUG_THREADS
-		if ((count = chan->lock.mutex.__m_count))
+		if ((count = chan->lock.mutex.__data.__count))
 #else
-		if ((count = chan->lock.__m_count))
+		if ((count = chan->lock.__data.__count))
 #endif
 			ast_log(LOG_DEBUG, ":::=== Still have %d locks (recursive)\n", count);
 #endif
@@ -4481,9 +4481,9 @@
 #ifdef __linux__
 		int count = 0;
 #ifdef DEBUG_THREADS
-		if ((count = chan->lock.mutex.__m_count))
+		if ((count = chan->lock.mutex.__data.__count))
 #else
-		if ((count = chan->lock.__m_count))
+		if ((count = chan->lock.__data.__count))
 #endif
 			ast_log(LOG_DEBUG, ":::=== Now have %d locks (recursive)\n", count);
 #endif
@@ -4517,9 +4517,9 @@
 #ifdef __linux__
 		int count = 0;
 #ifdef DEBUG_THREADS
-		if ((count = chan->lock.mutex.__m_count))
+		if ((count = chan->lock.mutex.__data.__count))
 #else
-		if ((count = chan->lock.__m_count))
+		if ((count = chan->lock.__data.__count))
 #endif
 			ast_log(LOG_DEBUG, ":::=== Now have %d locks (recursive)\n", count);
 #endif