[Asterisk-cvs] asterisk/apps app_intercom.c,1.18,1.19 app_meetme.c,1.38,1.39 app_queue.c,1.67,1.68 app_voicemail.c,1.107,1.108

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv11896/apps

Modified Files:
	app_intercom.c app_meetme.c app_queue.c app_voicemail.c 
Log Message:
Merge FreeBSD locking fixes (bug #1411)


Index: app_intercom.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_intercom.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- app_intercom.c	4 Jun 2004 15:44:14 -0000	1.18
+++ app_intercom.c	9 Jun 2004 01:45:07 -0000	1.19
@@ -59,7 +59,7 @@
 
 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)

Index: app_meetme.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_meetme.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- app_meetme.c	4 Jun 2004 15:44:14 -0000	1.38
+++ app_meetme.c	9 Jun 2004 01:45:07 -0000	1.39
@@ -125,7 +125,7 @@
 #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);
 

Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- app_queue.c	31 May 2004 23:44:04 -0000	1.67
+++ app_queue.c	9 Jun 2004 01:45:07 -0000	1.68
@@ -218,7 +218,7 @@
 };
 
 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)
 {

Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- app_voicemail.c	2 Jun 2004 00:03:49 -0000	1.107
+++ app_voicemail.c	9 Jun 2004 01:45:07 -0000	1.108
@@ -207,7 +207,7 @@
 
 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;