mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 12:52:33 +00:00
Merge major BSD mutex and symbol conflict patches (bug #1816) (link patch still pending)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -330,6 +330,7 @@ static void destroy_queue(struct ast_call_queue *q)
|
||||
}
|
||||
ast_mutex_unlock(&qlock);
|
||||
free_members(q, 1);
|
||||
ast_mutex_destroy(&q->lock);
|
||||
free(q);
|
||||
}
|
||||
|
||||
@@ -628,7 +629,7 @@ static int valid_exit(struct queue_ent *qe, char digit)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define MAX 256
|
||||
#define AST_MAX_WATCHERS 256
|
||||
|
||||
static struct localuser *wait_for_answer(struct queue_ent *qe, struct localuser *outgoing, int *to, int *allowredir_in, int *allowredir_out, int *allowdisconnect, char *digit)
|
||||
{
|
||||
@@ -641,7 +642,7 @@ static struct localuser *wait_for_answer(struct queue_ent *qe, struct localuser
|
||||
int orig = *to;
|
||||
struct ast_frame *f;
|
||||
struct localuser *peer = NULL;
|
||||
struct ast_channel *watchers[MAX];
|
||||
struct ast_channel *watchers[AST_MAX_WATCHERS];
|
||||
int pos;
|
||||
struct ast_channel *winner;
|
||||
struct ast_channel *in = qe->chan;
|
||||
|
Reference in New Issue
Block a user