Merge major BSD mutex and symbol conflict patches (bug #1816) (link patch still pending)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3273 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 0 deletions

diff --git a/pbx.c b/pbx.c
index 05f3dd20c..697c016f2 100755
--- a/pbx.c
+++ b/pbx.c
@@ -4173,6 +4173,7 @@ void __ast_context_destroy(struct ast_context *con, char *registrar)
 				e = e->next;
 				destroy_exten(el);
 			}
+                        ast_mutex_destroy(&tmp->lock);
 			free(tmp);
 			if (!con) {
 				/* Might need to get another one -- restart */