From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 30 May 2008 21:51:17 +0000 (+0000)
Subject: Fix a minor merge issue that caused a function to not get compiled in with
X-Git-Tag: 1.6.2.0-beta1~2112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da85b710ef7e96c28e466d2c2502f1855f3d84ff;p=thirdparty%2Fasterisk.git

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
---

diff --git a/main/utils.c b/main/utils.c
index 19fbf21e42..b6230da7b4 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
 {