mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +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:
@@ -59,7 +59,7 @@ STANDARD_LOCAL_USER;
|
||||
|
||||
LOCAL_USER_DECL;
|
||||
|
||||
static ast_mutex_t sound_lock = AST_MUTEX_INITIALIZER;
|
||||
AST_MUTEX_DEFINE_STATIC(sound_lock);
|
||||
static int sound = -1;
|
||||
|
||||
static int write_audio(short *data, int len)
|
||||
|
@@ -125,7 +125,7 @@ struct ast_conf_user {
|
||||
#define ADMINFLAG_KICKME (1 << 2) /* User is kicked */
|
||||
|
||||
|
||||
static ast_mutex_t conflock = AST_MUTEX_INITIALIZER;
|
||||
AST_MUTEX_DEFINE_STATIC(conflock);
|
||||
|
||||
static int admin_exec(struct ast_channel *chan, void *data);
|
||||
|
||||
|
@@ -218,7 +218,7 @@ struct ast_call_queue {
|
||||
};
|
||||
|
||||
static struct ast_call_queue *queues = NULL;
|
||||
static ast_mutex_t qlock = AST_MUTEX_INITIALIZER;
|
||||
AST_MUTEX_DEFINE_STATIC(qlock);
|
||||
|
||||
static char *int2strat(int strategy)
|
||||
{
|
||||
|
@@ -207,7 +207,7 @@ static char *app2 = "VoiceMailMain";
|
||||
|
||||
static char *app3 = "MailboxExists";
|
||||
|
||||
static ast_mutex_t vmlock = AST_MUTEX_INITIALIZER;
|
||||
AST_MUTEX_DEFINE_STATIC(vmlock);
|
||||
struct ast_vm_user *users;
|
||||
struct ast_vm_user *usersl;
|
||||
struct vm_zone *zones = NULL;
|
||||
|
Reference in New Issue
Block a user