diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-22 16:25:04 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-22 16:25:04 +0000 |
| commit | caa651b8dcd733b1bf9309d5d026290e1a3810e1 (patch) | |
| tree | 1d2e5a55b6e1ef7021833c7d0e05ec823ac99624 | |
| parent | cd62ad94f42817043a208809c051c36d5f7e297d (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@43488 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/channel.c b/main/channel.c index 39c8f8d18..421bbee82 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 |