Merge FreeBSD locking fixes (bug #1411)

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

10 files changed, 10 insertions, 10 deletions

diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c
index 4b6634262..84d23a146 100755
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -27,7 +27,7 @@
 
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt = 0;
 
 static char *tdesc = "A-law and Mulaw direct Coder/Decoder";
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 6ca656a23..9aa0304c7 100755
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -28,7 +28,7 @@
 
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt = 0;
 
 static char *tdesc = "Adaptive Differential PCM Coder/Decoder";
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 08baba4bd..5574cd451 100755
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -26,7 +26,7 @@
 
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt = 0;
 
 static char *tdesc = "A-law Coder/Decoder";
diff --git a/codecs/codec_g723_1.c b/codecs/codec_g723_1.c
index 0d793897f..3692b56ab 100755
--- a/codecs/codec_g723_1.c
+++ b/codecs/codec_g723_1.c
@@ -56,7 +56,7 @@
 #include "slin_g723_ex.h"
 #include "g723_slin_ex.h"
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt=0;
 
 #ifdef ANNEX_B
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index ac32678ca..3dad026dd 100755
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -29,7 +29,7 @@
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 #define BUF_SHIFT	5
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt = 0;
 
 static char *tdesc = "ITU G.726-32kbps G726 Transcoder";
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index f0efe1a82..8e37c70ec 100755
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -39,7 +39,7 @@
 #include "slin_gsm_ex.h"
 #include "gsm_slin_ex.h"
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt=0;
 
 static char *tdesc = "GSM/PCM16 (signed linear) Codec Translator";
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index d3497ba41..947921249 100755
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -35,7 +35,7 @@
 
 #define USE_ILBC_ENHANCER	0
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt=0;
 
 static char *tdesc = "iLBC/PCM16 (signed linear) Codec Translator";
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index ffd1ddc23..2b054710a 100755
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -43,7 +43,7 @@
 
 #define LPC10_BYTES_IN_COMPRESSED_FRAME (LPC10_BITS_IN_COMPRESSED_FRAME + 7)/8
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt=0;
 
 static char *tdesc = "LPC10 2.4kbps (signed linear) Voice Coder";
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index ae731fafa..4bd5155dd 100755
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -37,7 +37,7 @@
 #include "slin_speex_ex.h"
 #include "speex_slin_ex.h"
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt=0;
 
 static char *tdesc = "Speex/PCM16 (signed linear) Codec Translator";
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index 41101897d..55ff81e1c 100755
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -26,7 +26,7 @@
 
 #define BUFFER_SIZE   8096	/* size for the translation buffers */
 
-static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(localuser_lock);
 static int localusecnt = 0;
 
 static char *tdesc = "Mu-law Coder/Decoder";