diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-04 17:53:46 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-04 17:53:46 +0000 |
| commit | 9cbe4b278ee990234ca9488afb54e4907d0ce1d1 (patch) | |
| tree | 4070b2468d4ee0d7451f7c5bdcfb80b60e5077b0 /include | |
| parent | 2a2bedfdd928d0a1e400fe93b571867835c2dad7 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@216553 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -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 9caf8d6c3..04901cdc9 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. |