diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-09-04 17:50:21 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-09-04 17:50:21 +0000 |
| commit | 5dfaf5c8b7ca3bfc711a7cd2f6bd87d2ace0b6d8 (patch) | |
| tree | cb050a8999ec407782c1c54d6779aea83ef865ef /include/asterisk/lock.h | |
| parent | ad69df830d5454f971ba7c7ba1c477066731d4bd (diff) | |
Fix trunk breakage.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@216551 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/lock.h')
| -rw-r--r-- | include/asterisk/lock.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index a4005d7ca..bfbed1e6f 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -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. |