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/res/res_crypto.c b/res/res_crypto.c
index 2a2e5cb8b..e0cb6233c 100755
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -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)
 
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 2f028ca93..43b6d728e 100755
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -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;
 
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index d6bc6c760..27519a7ea 100755
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -99,7 +99,7 @@ struct mohdata {
 
 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"
diff --git a/res/res_parking.c b/res/res_parking.c
index e63f490cb..29db04136 100755
--- a/res/res_parking.c
+++ b/res/res_parking.c
@@ -84,7 +84,7 @@ struct parkeduser {
 
 static struct parkeduser *parkinglot;
 
-static ast_mutex_t parking_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(parking_lock);
 
 static pthread_t parking_thread;