[svn-commits] mvanbaak: branch 1.6.1 r216440 - in /branches/1.6.1: ./ include/asterisk/lock.h

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Fri Sep  4 09:12:11 2009
New Revision: 216440

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=216440
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/lock.h

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/include/asterisk/lock.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/include/asterisk/lock.h?view=diff&rev=216440&r1=216439&r2=216440
==============================================================================
--- branches/1.6.1/include/asterisk/lock.h (original)
+++ branches/1.6.1/include/asterisk/lock.h Fri Sep  4 09:12:11 2009
@@ -1554,6 +1554,7 @@
 {
 	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 @@
 {
 	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