aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-29 14:26:22 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-29 14:26:22 +0000
commit5365b8c5ac9397d46409b7bb866fb5711195287e (patch)
tree66d56a32bb9ed57bfd02df7828d36246706ffd00 /include
parent69c7d936915ab520bb755cebe013d179392bf175 (diff)
do the multiple-lock check for cond_wait properly...
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@7219 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rwxr-xr-xinclude/asterisk/lock.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 39af89736..38c4e64ac 100755
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -396,7 +396,7 @@ static inline int __ast_cond_wait(const char *filename, int lineno, const char *
#endif
}
- if (t->reentrancy)
+ if (t->reentrancy > 1)
__ast_mutex_logger("%s line %d (%s): mutex '%s' locked more than once, cond_wait will block!\n",
filename, lineno, func, mutex_name);
@@ -459,7 +459,7 @@ static inline int __ast_cond_timedwait(const char *filename, int lineno, const c
#endif
}
- if (t->reentrancy)
+ if (t->reentrancy > 1)
__ast_mutex_logger("%s line %d (%s): mutex '%s' locked more than once, cond_timedwait will block!\n",
filename, lineno, func, mutex_name);