[Asterisk-cvs] asterisk/formats format_g723.c,1.12,1.13 format_g726.c,1.2,1.3 format_g729.c,1.10,1.11 format_gsm.c,1.15,1.16 format_h263.c,1.4,1.5 format_ilbc.c,1.3,1.4 format_pcm.c,1.11,1.12 format_pcm_alaw.c,1.10,1.11 format_vox.c,1.13,1.14 format_wav.c,1.16,1.17 format_wav_gsm.c,1.19,1.20

markster at lists.digium.com markster at lists.digium.com
Tue Jun 8 20:42:08 CDT 2004


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

Modified Files:
	format_g723.c format_g726.c format_g729.c format_gsm.c 
	format_h263.c format_ilbc.c format_pcm.c format_pcm_alaw.c 
	format_vox.c format_wav.c format_wav_gsm.c 
Log Message:
Merge FreeBSD locking fixes (bug #1411)


Index: format_g723.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_g723.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- format_g723.c	25 Feb 2004 22:31:51 -0000	1.12
+++ format_g723.c	9 Jun 2004 01:45:08 -0000	1.13
@@ -42,7 +42,7 @@
 };
 
 
-static ast_mutex_t g723_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(g723_lock);
 static int glistcnt = 0;
 
 static char *name = "g723sf";

Index: format_g726.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_g726.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- format_g726.c	21 Apr 2004 04:27:58 -0000	1.2
+++ format_g726.c	9 Jun 2004 01:45:08 -0000	1.3
@@ -59,7 +59,7 @@
 	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";

Index: format_g729.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_g729.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- format_g729.c	15 Apr 2004 16:02:42 -0000	1.10
+++ format_g729.c	9 Jun 2004 01:45:08 -0000	1.11
@@ -49,7 +49,7 @@
 };
 
 
-static ast_mutex_t g729_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(g729_lock);
 static int glistcnt = 0;
 
 static char *name = "g729";

Index: format_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_gsm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- format_gsm.c	15 Apr 2004 16:02:42 -0000	1.15
+++ format_gsm.c	9 Jun 2004 01:45:08 -0000	1.16
@@ -58,7 +58,7 @@
 };
 
 
-static ast_mutex_t gsm_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(gsm_lock);
 static int glistcnt = 0;
 
 static char *name = "gsm";

Index: format_h263.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_h263.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- format_h263.c	22 Jan 2004 21:30:04 -0000	1.4
+++ format_h263.c	9 Jun 2004 01:45:08 -0000	1.5
@@ -50,7 +50,7 @@
 };
 
 
-static ast_mutex_t h263_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(h263_lock);
 static int glistcnt = 0;
 
 static char *name = "h263";

Index: format_ilbc.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_ilbc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- format_ilbc.c	1 May 2004 04:19:56 -0000	1.3
+++ format_ilbc.c	9 Jun 2004 01:45:08 -0000	1.4
@@ -51,7 +51,7 @@
 };
 
 
-static ast_mutex_t ilbc_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(ilbc_lock);
 static int glistcnt = 0;
 
 static char *name = "iLBC";

Index: format_pcm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_pcm.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- format_pcm.c	15 Apr 2004 16:02:42 -0000	1.11
+++ format_pcm.c	9 Jun 2004 01:45:08 -0000	1.12
@@ -47,7 +47,7 @@
 };
 
 
-static ast_mutex_t pcm_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(pcm_lock);
 static int glistcnt = 0;
 
 static char *name = "pcm";

Index: format_pcm_alaw.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_pcm_alaw.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- format_pcm_alaw.c	15 Apr 2004 16:02:42 -0000	1.10
+++ format_pcm_alaw.c	9 Jun 2004 01:45:08 -0000	1.11
@@ -54,7 +54,7 @@
 };
 
 
-static ast_mutex_t pcm_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(pcm_lock);
 static int glistcnt = 0;
 
 static char *name = "alaw";

Index: format_vox.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_vox.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- format_vox.c	11 Mar 2004 19:57:10 -0000	1.13
+++ format_vox.c	9 Jun 2004 01:45:08 -0000	1.14
@@ -51,7 +51,7 @@
 };
 
 
-static ast_mutex_t vox_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(vox_lock);
 static int glistcnt = 0;
 
 static char *name = "vox";

Index: format_wav.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_wav.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- format_wav.c	15 Apr 2004 16:02:42 -0000	1.16
+++ format_wav.c	9 Jun 2004 01:45:08 -0000	1.17
@@ -53,7 +53,7 @@
 };
 
 
-static ast_mutex_t wav_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(wav_lock);
 static int glistcnt = 0;
 
 static char *name = "wav";

Index: format_wav_gsm.c
===================================================================
RCS file: /usr/cvsroot/asterisk/formats/format_wav_gsm.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- format_wav_gsm.c	15 Apr 2004 16:02:42 -0000	1.19
+++ format_wav_gsm.c	9 Jun 2004 01:45:08 -0000	1.20
@@ -63,7 +63,7 @@
 };
 
 
-static ast_mutex_t wav_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(wav_lock);
 static int glistcnt = 0;
 
 static char *name = "wav49";




More information about the svn-commits mailing list