From: Michiel van Baak <michiel@vanbaak.info>
Date: Fri, 4 Sep 2009 14:12:11 +0000 (+0000)
Subject: Merged revisions 216437 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cc974b00af15c5cbb76f2dfb3e286783216463f;p=thirdparty%2Fasterisk.git

Merged revisions 216437 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r216437 | mvanbaak | 2009-09-04 16:00:38 +0200 (Fri, 04 Sep 2009) | 2 lines

  make sure canlog is set so we can compile with DEBUG_THREADS enabled on OpenBSD
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@216440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 1bd300e406..9caf8d6c3c 100644
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -1554,6 +1554,7 @@ static inline int _ast_rwlock_tryrdlock(ast_rwlock_t *t, const char *name,
 {
 	int res;
 	struct ast_lock_track *lt = &t->track;
+	int canlog = strcmp(filename, "logger.c") & t->tracking;
 #ifdef HAVE_BKTR
 	struct ast_bt *bt = NULL;
 #endif
@@ -1612,6 +1613,7 @@ static inline int _ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name,
 {
 	int res;
 	struct ast_lock_track *lt= &t->track;
+	int canlog = strcmp(filename, "logger.c") & t->tracking;
 #ifdef HAVE_BKTR
 	struct ast_bt *bt = NULL;
 #endif