Merge FreeBSD locking fixes (bug #1411)

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

11 files changed, 11 insertions, 11 deletions

diff --git a/formats/format_g723.c b/formats/format_g723.c
index 1b610f1f0..cf5228f8b 100755
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -42,7 +42,7 @@ struct ast_filestream {
 };
 
 
-static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(g723_lock);
 static int glistcnt = 0;
 
 static char *name = "g723sf";
diff --git a/formats/format_g726.c b/formats/format_g726.c
index c12b6275f..acb44c728 100755
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -59,7 +59,7 @@ struct ast_filestream {
 	unsigned char g726[FRAME_TIME * 5];	/* G.726 encoded voice */
 };
 
-static ast_mutex_t g726_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(g726_lock);
 static int glistcnt = 0;
 
 static char *desc = "Raw G.726 (16/24/32/40kbps) data";
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 68dde216f..9f7531d5f 100755
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -49,7 +49,7 @@ struct ast_filestream {
 };
 
 
-static ast_mutex_t g729_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(g729_lock);
 static int glistcnt = 0;
 
 static char *name = "g729";
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index d58039e6d..619786e56 100755
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -58,7 +58,7 @@ struct ast_filestream {
 };
 
 
-static ast_mutex_t gsm_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(gsm_lock);
 static int glistcnt = 0;
 
 static char *name = "gsm";
diff --git a/formats/format_h263.c b/formats/format_h263.c
index 7a8866666..dd8a21454 100755
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -50,7 +50,7 @@ struct ast_filestream {
 };
 
 
-static ast_mutex_t h263_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(h263_lock);
 static int glistcnt = 0;
 
 static char *name = "h263";
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index d4863c720..0d50900d9 100755
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -51,7 +51,7 @@ struct ast_filestream {
 };
 
 
-static ast_mutex_t ilbc_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(ilbc_lock);
 static int glistcnt = 0;
 
 static char *name = "iLBC";
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index bc548992b..2ad29471c 100755
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -47,7 +47,7 @@ struct ast_filestream {
 };
 
 
-static ast_mutex_t pcm_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(pcm_lock);
 static int glistcnt = 0;
 
 static char *name = "pcm";
diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c
index db6b0c3d0..55911d8f3 100755
--- a/formats/format_pcm_alaw.c
+++ b/formats/format_pcm_alaw.c
@@ -54,7 +54,7 @@ struct ast_filestream {
 };
 
 
-static ast_mutex_t pcm_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(pcm_lock);
 static int glistcnt = 0;
 
 static char *name = "alaw";
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 20021fb73..095332a51 100755
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -51,7 +51,7 @@ struct ast_filestream {
 };
 
 
-static ast_mutex_t vox_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(vox_lock);
 static int glistcnt = 0;
 
 static char *name = "vox";
diff --git a/formats/format_wav.c b/formats/format_wav.c
index 52f1508ab..804c38c4e 100755
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -53,7 +53,7 @@ struct ast_filestream {
 };
 
 
-static ast_mutex_t wav_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(wav_lock);
 static int glistcnt = 0;
 
 static char *name = "wav";
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index 6c988bdb8..a9f9df838 100755
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -63,7 +63,7 @@ struct ast_filestream {
 };
 
 
-static ast_mutex_t wav_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(wav_lock);
 static int glistcnt = 0;
 
 static char *name = "wav49";