mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-06 01:45:11 +00:00
Merged revisions 187599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r187599 | tilghman | 2009-04-09 22:55:27 -0500 (Thu, 09 Apr 2009) | 2 lines Modify headers and macros, according to Russell's suggestions on the -dev list ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@187600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -1335,6 +1335,7 @@ static inline int _ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
|
||||
if (lt->reentrancy) {
|
||||
ast_reentrancy_lock(lt);
|
||||
bt = <->backtrace[lt->reentrancy-1];
|
||||
ast_reentrancy_unlock(lt);
|
||||
} else {
|
||||
bt = NULL;
|
||||
}
|
||||
@@ -1353,7 +1354,7 @@ static inline int _ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
|
||||
return res;
|
||||
}
|
||||
|
||||
#define ast_rwlock_timedrdlock(a,b) \
|
||||
#define ast_rwlock_timedrdlock(a, b) \
|
||||
_ast_rwlock_timedrdlock(a, # a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||
|
||||
static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name,
|
||||
@@ -1413,6 +1414,7 @@ static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name,
|
||||
if (lt->reentrancy) {
|
||||
ast_reentrancy_lock(lt);
|
||||
bt = <->backtrace[lt->reentrancy-1];
|
||||
ast_reentrancy_unlock(lt);
|
||||
} else {
|
||||
bt = NULL;
|
||||
}
|
||||
@@ -1431,7 +1433,7 @@ static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name,
|
||||
return res;
|
||||
}
|
||||
|
||||
#define ast_rwlock_timedwrlock(a,b) \
|
||||
#define ast_rwlock_timedwrlock(a, b) \
|
||||
_ast_rwlock_timedwrlock(a, # a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__)
|
||||
|
||||
static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name,
|
||||
@@ -1491,6 +1493,7 @@ static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name,
|
||||
if (lt->reentrancy) {
|
||||
ast_reentrancy_lock(lt);
|
||||
bt = <->backtrace[lt->reentrancy-1];
|
||||
ast_reentrancy_unlock(lt);
|
||||
} else {
|
||||
bt = NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user