Fix trunk breakage.
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 4 Sep 2009 17:50:21 +0000 (17:50 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 4 Sep 2009 17:50:21 +0000 (17:50 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@216551 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/lock.h

index a4005d7..bfbed1e 100644 (file)
@@ -1556,13 +1556,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.
@@ -1615,13 +1614,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.