diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-30 21:51:17 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-30 21:51:17 +0000 |
| commit | 7c67640f407ea25f9d32edba69e0277fd1ba120f (patch) | |
| tree | 3b9491e87ef6c5a0543edfe38617711ffc2cf7ce /main/utils.c | |
| parent | 27c477dabc6f50bb1a9d91de10fcab61e92514a0 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@119423 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/utils.c')
| -rw-r--r-- | main/utils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/utils.c b/main/utils.c index 19fbf21e4..b6230da7b 100644 --- a/main/utils.c +++ b/main/utils.c @@ -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 { |