diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 9caf8d6c3c..04901cdc9f 100644 --- 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.