[Asterisk-cvs] asterisk/res res_crypto.c,1.6,1.7 res_monitor.c,1.16,1.17 res_musiconhold.c,1.28,1.29 res_parking.c,1.23,1.24

[markster at lists.digium.com]

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

Modified Files:
	res_crypto.c res_monitor.c res_musiconhold.c res_parking.c 
Log Message:
Merge FreeBSD locking fixes (bug #1411)


Index: res_crypto.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_crypto.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- res_crypto.c	13 Aug 2003 15:25:16 -0000	1.6
+++ res_crypto.c	9 Jun 2004 01:45:08 -0000	1.7
@@ -59,7 +59,7 @@
 static char base64[64];
 static char b2a[256];
 
-static ast_mutex_t keylock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(keylock);
 
 #define KEY_NEEDS_PASSCODE (1 << 16)
 

Index: res_monitor.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_monitor.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- res_monitor.c	7 Jun 2004 16:51:21 -0000	1.16
+++ res_monitor.c	9 Jun 2004 01:45:08 -0000	1.17
@@ -23,7 +23,7 @@
 
 #define AST_MONITOR_DIR	AST_SPOOL_DIR "/monitor"
 
-static ast_mutex_t monitorlock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(monitorlock);
 
 static unsigned long seq = 0;
 

Index: res_musiconhold.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- res_musiconhold.c	4 Jun 2004 15:44:14 -0000	1.28
+++ res_musiconhold.c	9 Jun 2004 01:45:08 -0000	1.29
@@ -99,7 +99,7 @@
 
 static struct mohclass *mohclasses;
 
-static ast_mutex_t moh_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(moh_lock);
 
 #define LOCAL_MPG_123 "/usr/local/bin/mpg123"
 #define MPG_123 "/usr/bin/mpg123"

Index: res_parking.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_parking.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- res_parking.c	20 May 2004 16:30:10 -0000	1.23
+++ res_parking.c	9 Jun 2004 01:45:08 -0000	1.24
@@ -84,7 +84,7 @@
 
 static struct parkeduser *parkinglot;
 
-static ast_mutex_t parking_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(parking_lock);
 
 static pthread_t parking_thread;