kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a minor merge issue that caused a function to not get compiled in with

Browse Source 
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:
Russell Bryant
2008-05-30 21:51:17 +00:00
parent ae317add1b
commit da85b710ef
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/utils.c
View File

@@ -674,9 +674,7 @@ void ast_mark_lock_failed(void *lock_addr)
} }
pthread_mutex_unlock(&lock_info->lock); 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) 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; 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; 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) void ast_remove_lock_info(void *lock_addr)
#endif #endif
{ {