mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
Merge FreeBSD locking fixes (bug #1411)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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";
|
||||
|
@@ -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";
|
||||
|
@@ -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";
|
||||
|
@@ -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";
|
||||
|
@@ -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";
|
||||
|
@@ -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";
|
||||
|
@@ -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";
|
||||
|
@@ -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";
|
||||
|
@@ -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";
|
||||
|
@@ -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";
|
||||
|
@@ -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";
|
||||
|
Reference in New Issue
Block a user