diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_dahdibarge.c | 2 | ||||
-rw-r--r-- | apps/app_dahdiras.c | 2 | ||||
-rw-r--r-- | apps/app_dahdiscan.c | 2 | ||||
-rw-r--r-- | apps/app_meetme.c | 2 | ||||
-rw-r--r-- | apps/app_rpt.c | 12 |
5 files changed, 10 insertions, 10 deletions
diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c index a59edc9af..1c13eb0a3 100644 --- a/apps/app_dahdibarge.c +++ b/apps/app_dahdibarge.c @@ -99,7 +99,7 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags) int origfd; int ret = -1; - DAHDI_BUFFERINFO bi; + struct dahdi_bufferinfo bi; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char *buf = __buf + AST_FRIENDLY_OFFSET; diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c index 61848a347..1671f8bdd 100644 --- a/apps/app_dahdiras.c +++ b/apps/app_dahdiras.c @@ -180,7 +180,7 @@ static int dahdiras_exec(struct ast_channel *chan, void *data) { int res=-1; char *args; - DAHDI_PARAMS dahdip; + struct dahdi_params dahdip; if (!data) data = ""; diff --git a/apps/app_dahdiscan.c b/apps/app_dahdiscan.c index 1f2a0f8fd..6ed55dd7d 100644 --- a/apps/app_dahdiscan.c +++ b/apps/app_dahdiscan.c @@ -108,7 +108,7 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags) char input[4]; int ic = 0; - DAHDI_BUFFERINFO bi; + struct dahdi_bufferinfo bi; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char *buf = __buf + AST_FRIENDLY_OFFSET; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 1c55bb6dd..5683f6ca4 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1520,7 +1520,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c char members[10] = ""; int dtmf, opt_waitmarked_timeout = 0; time_t timeout = 0; - DAHDI_BUFFERINFO bi; + struct dahdi_bufferinfo bi; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char *buf = __buf + AST_FRIENDLY_OFFSET; char *exitkeys = NULL; diff --git a/apps/app_rpt.c b/apps/app_rpt.c index aa0218ba8..794faff42 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -3929,7 +3929,7 @@ static int split_freq(char *mhz, char *decimals, char *freq); static void *rpt_tele_thread(void *this) { -DAHDI_CONFINFO ci; /* conference info */ +struct dahdi_confinfo ci; /* conference info */ int res = 0,haslink,hastx,hasremote,imdone = 0, unkeys_queued, x; struct rpt_tele *mytele = (struct rpt_tele *)this; struct rpt_tele *tlist; @@ -5280,7 +5280,7 @@ char *v1, *v2; static void *rpt_call(void *this) { -DAHDI_CONFINFO ci; /* conference info */ +struct dahdi_confinfo ci; /* conference info */ struct rpt *myrpt = (struct rpt *)this; int res; int stopped,congstarted,dialtimer,lastcidx,aborted; @@ -5685,7 +5685,7 @@ static int connect_link(struct rpt *myrpt, char* node, int mode, int perma) struct rpt_link *l; int reconnects = 0; int i,n; - DAHDI_CONFINFO ci; /* conference info */ + struct dahdi_confinfo ci; /* conference info */ val = node_lookup(myrpt,node); if (!val){ @@ -10721,7 +10721,7 @@ char *tele,*idtalkover,c,myfirst,*p; int ms = MSWAIT,i,lasttx=0,val,remrx=0,identqueued,othertelemqueued; int tailmessagequeued,ctqueued,dtmfed,lastmyrx,localmsgqueued; struct ast_channel *who; -DAHDI_CONFINFO ci; /* conference info */ +struct dahdi_confinfo ci; /* conference info */ time_t t; struct rpt_link *l,*m; struct rpt_tele *telem; @@ -13120,8 +13120,8 @@ static int rpt_exec(struct ast_channel *chan, void *data) struct ast_channel *who; struct ast_channel *cs[20]; struct rpt_link *l; - DAHDI_CONFINFO ci; /* conference info */ - DAHDI_PARAMS par; + struct dahdi_confinfo ci; /* conference info */ + struct dahdi_params par; int ms,elap,nullfd; time_t t,last_timeout_warning; struct dahdi_radio_param z; |