[asterisk-commits] tilghman: branch 1.6.1 r216552 - in /branches/1.6.1: ./ include/asterisk/lock.h

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Sep  4 12:53:09 2009
New Revision: 216552

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=216552
Log:
Merged revisions 216551 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r216551 | tilghman | 2009-09-04 12:50:21 -0500 (Fri, 04 Sep 2009) | 2 lines
  
  Fix trunk breakage.
........

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=216552&r1=216551&r2=216552
==============================================================================
--- branches/1.6.1/include/asterisk/lock.h (original)
+++ branches/1.6.1/include/asterisk/lock.h Fri Sep  4 12:53:09 2009
@@ -1554,13 +1554,12 @@
 {
 	int res;
 	struct ast_lock_track *lt = &t->track;
+#ifdef HAVE_BKTR
+	struct ast_bt *bt = NULL;
+#endif
+#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
 	int canlog = strcmp(filename, "logger.c") & t->tracking;
-#ifdef HAVE_BKTR
-	struct ast_bt *bt = NULL;
-#endif
-
-
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+
 	if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
 		 /* Don't warn abount uninitialized lock.
 		  * Simple try to initialize it.
@@ -1613,13 +1612,12 @@
 {
 	int res;
 	struct ast_lock_track *lt= &t->track;
+#ifdef HAVE_BKTR
+	struct ast_bt *bt = NULL;
+#endif
+#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
 	int canlog = strcmp(filename, "logger.c") & t->tracking;
-#ifdef HAVE_BKTR
-	struct ast_bt *bt = NULL;
-#endif
-
-
-#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+
 	if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
 		 /* Don't warn abount uninitialized lock.
 		  * Simple try to initialize it.