[Asterisk-cvs] asterisk/pbx pbx_config.c,1.37,1.38 pbx_gtkconsole.c,1.12,1.13

[markster at lists.digium.com]

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

Modified Files:
	pbx_config.c pbx_gtkconsole.c 
Log Message:
Merge FreeBSD locking fixes (bug #1411)


Index: pbx_config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_config.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- pbx_config.c	3 May 2004 04:38:31 -0000	1.37
+++ pbx_config.c	9 Jun 2004 01:45:08 -0000	1.38
@@ -42,7 +42,7 @@
 static int static_config = 0;
 static int write_protect_config = 1;
 
-static ast_mutex_t save_dialplan_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(save_dialplan_lock);
 
 static struct ast_context *local_contexts = NULL;
 

Index: pbx_gtkconsole.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_gtkconsole.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pbx_gtkconsole.c	8 Sep 2003 16:48:07 -0000	1.12
+++ pbx_gtkconsole.c	9 Jun 2004 01:45:08 -0000	1.13
@@ -41,7 +41,7 @@
 #include "../asterisk.h"
 #include "../astconf.h"
 
-static ast_mutex_t verb_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(verb_lock);
 
 static pthread_t console_thread;