summaryrefslogtreecommitdiff
path: root/include/asterisk
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2005-09-01 00:05:47 +0000
committerKevin P. Fleming <kpfleming@digium.com>2005-09-01 00:05:47 +0000
commitfc91dd1035f5f33f14b397c89b79f11bb91ca079 (patch)
treeb724cac00f60ab169c2143b540255deda9b7211a /include/asterisk
parente86bb7064238e4d3315c610e3b483869abe5fd3c (diff)
eliminate spurious warnings
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rwxr-xr-xinclude/asterisk/lock.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index da261b83d..9353ab63a 100755
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -295,7 +295,7 @@ static inline int __ast_pthread_mutex_unlock(const char *filename, int lineno, c
}
#endif
- if (t->thread != pthread_self()) {
+ if (t->reentrancy && (t->thread != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
@@ -342,7 +342,7 @@ static inline int __ast_pthread_cond_wait(const char *filename, int lineno, cons
}
#endif
- if (t->thread != pthread_self()) {
+ if (t->reentrancy && (t->thread != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
@@ -396,7 +396,7 @@ static inline int __ast_pthread_cond_timedwait(const char *filename, int lineno,
}
#endif
- if (t->thread != pthread_self()) {
+ if (t->reentrancy && (t->thread != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",