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.
........

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

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index 9caf8d6c3c4cf10aa11be3acd2ab65503a4b2e33..04901cdc9f68200f3552b67a9015bdef4cce4a21 100644 (file)
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -1554,13 +1554,12 @@ 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
-
-
 #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+       int canlog = strcmp(filename, "logger.c") & t->tracking;
+
        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 @@ 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
-
-
 #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+       int canlog = strcmp(filename, "logger.c") & t->tracking;
+
        if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
                 /* Don't warn abount uninitialized lock.
                  * Simple try to initialize it.