diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-05-31 16:25:56 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2002-05-31 16:25:56 +0000 |
| commit | 0bcfd1a8b43e74e93ab9b2327444086e9bb25721 (patch) | |
| tree | 5cdf13d2a270b3d38069673afabc4ec0fa95d8b9 /channels/chan_vofr.c | |
| parent | a1900b506edd9b07beb14c19102517844c08f93d (diff) | |
Version 0.1.12 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@456 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_vofr.c')
| -rwxr-xr-x | channels/chan_vofr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/channels/chan_vofr.c b/channels/chan_vofr.c index 00cb19bb3..f1bb5e539 100755 --- a/channels/chan_vofr.c +++ b/channels/chan_vofr.c @@ -14,6 +14,7 @@ #include <stdio.h> #include <pthread.h> #include <string.h> +#include <asterisk/lock.h> #include <asterisk/channel.h> #include <asterisk/channel_pvt.h> #include <asterisk/config.h> @@ -52,14 +53,14 @@ static char context[AST_MAX_EXTENSION] = "default"; static char language[MAX_LANGUAGE] = ""; static int usecnt =0; -static pthread_mutex_t usecnt_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER; /* Protect the interface list (of vofr_pvt's) */ -static pthread_mutex_t iflock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t iflock = AST_MUTEX_INITIALIZER; /* Protect the monitoring thread, so only one process can kill or start it, and not when it's doing something critical. */ -static pthread_mutex_t monlock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t monlock = AST_MUTEX_INITIALIZER; /* This is the thread for the monitor which checks for input on the channels which are not currently in use. */ @@ -798,7 +799,7 @@ static int vofr_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) static struct ast_channel *vofr_new(struct vofr_pvt *i, int state) { struct ast_channel *tmp; - tmp = ast_channel_alloc(); + tmp = ast_channel_alloc(0); if (tmp) { #ifdef OLD_SANGOMA_API snprintf(tmp->name, sizeof(tmp->name), "AdtranVoFR/%s", i->sa.spkt_device); |