[asterisk-commits] russell: trunk r119423 - /trunk/main/utils.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri May 30 16:51:17 2008
New Revision: 119423

URL: http://svn.digium.com/view/asterisk?view=rev&rev=119423
Log:
Fix a minor merge issue that caused a function to not get compiled in with
DEBUG_THREADS like it was supposed to

Modified:
    trunk/main/utils.c

Modified: trunk/main/utils.c
URL: http://svn.digium.com/view/asterisk/trunk/main/utils.c?view=diff&rev=119423&r1=119422&r2=119423
==============================================================================
--- trunk/main/utils.c (original)
+++ trunk/main/utils.c Fri May 30 16:51:17 2008
@@ -674,9 +674,7 @@
 	}
 	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 @@
 	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
 {