Merge FreeBSD locking fixes (bug #1411)

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

4 files changed, 4 insertions, 4 deletions

diff --git a/apps/app_intercom.c b/apps/app_intercom.c
index a4d863697..4462be180 100755
--- a/apps/app_intercom.c
+++ b/apps/app_intercom.c
@@ -59,7 +59,7 @@ STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-static ast_mutex_t sound_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(sound_lock);
 static int sound = -1;
 
 static int write_audio(short *data, int len)
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 591ea5af8..84f2e1081 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -125,7 +125,7 @@ struct ast_conf_user {
 #define ADMINFLAG_KICKME (1 << 2)	/* User is kicked */
 
 
-static ast_mutex_t conflock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(conflock);
 
 static int admin_exec(struct ast_channel *chan, void *data);
 
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 840c5fca7..86047fdbe 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -218,7 +218,7 @@ struct ast_call_queue {
 };
 
 static struct ast_call_queue *queues = NULL;
-static ast_mutex_t qlock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(qlock);
 
 static char *int2strat(int strategy)
 {
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index fd47cac8c..e2f3fbfc6 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -207,7 +207,7 @@ static char *app2 = "VoiceMailMain";
 
 static char *app3 = "MailboxExists";
 
-static ast_mutex_t vmlock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(vmlock);
 struct ast_vm_user *users;
 struct ast_vm_user *usersl;
 struct vm_zone *zones = NULL;