kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-27 14:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix trunk breakage.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@216551 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-09-04 17:50:21 +00:00
parent ad69df830d
commit 5dfaf5c8b7
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/asterisk/lock.h
View File

@@ -1556,13 +1556,12 @@ static inline int _ast_rwlock_tryrdlock(ast_rwlock_t *t, const char *name,
{ {
int res; int res;
struct ast_lock_track *lt = &t->track; struct ast_lock_track *lt = &t->track;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
struct ast_bt *bt = NULL; struct ast_bt *bt = NULL;
#endif #endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
int canlog = strcmp(filename, "logger.c") & t->tracking;
if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) { if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
/* Don't warn abount uninitialized lock. /* Don't warn abount uninitialized lock.
* Simple try to initialize it. * Simple try to initialize it.
@@ -1615,13 +1614,12 @@ static inline int _ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name,
{ {
int res; int res;
struct ast_lock_track *lt= &t->track; struct ast_lock_track *lt= &t->track;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
struct ast_bt *bt = NULL; struct ast_bt *bt = NULL;
#endif #endif
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
int canlog = strcmp(filename, "logger.c") & t->tracking;
if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) { if ((t->lock) == ((pthread_rwlock_t) __AST_RWLOCK_INIT_VALUE)) {
/* Don't warn abount uninitialized lock. /* Don't warn abount uninitialized lock.
* Simple try to initialize it. * Simple try to initialize it.