From acf824fe5e30c29e05c27e7372a57e12189450fa Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" <kpfleming@digium.com> Date: Fri, 22 Sep 2006 16:25:04 +0000 Subject: [PATCH] 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... ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43488 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main/channel.c b/main/channel.c index 39c8f8d180..421bbee821 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4445,9 +4445,9 @@ int ast_channel_unlock(struct ast_channel *chan) #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 @@ int ast_channel_lock(struct ast_channel *chan) #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 @@ int ast_channel_trylock(struct ast_channel *chan) #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 -- GitLab