mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-25 07:01:09 +00:00
Fix a minor merge issue that caused a function to not get compiled in with
DEBUG_THREADS like it was supposed to git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@119423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -674,9 +674,7 @@ void ast_mark_lock_failed(void *lock_addr)
|
||||
}
|
||||
pthread_mutex_unlock(&lock_info->lock);
|
||||
}
|
||||
#ifdef HAVE_BKTR
|
||||
void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
|
||||
#else
|
||||
|
||||
int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, const char **func, const char **mutex_name)
|
||||
{
|
||||
struct thr_lock_info *lock_info;
|
||||
@@ -705,6 +703,9 @@ int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, cons
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef HAVE_BKTR
|
||||
void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
|
||||
#else
|
||||
void ast_remove_lock_info(void *lock_addr)
|
||||
#endif
|
||||
{
|
||||
|
Reference in New Issue
Block a user