diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-29 22:22:13 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-29 22:22:13 +0000 |
| commit | c5d4094208be0560db143a37d56bc4e445675d7d (patch) | |
| tree | dfe1d3cc46cf188010bce49e886cd2d882b3535a /apps/app_rpt.c | |
| parent | 6a26d91c7ea392e0d8a2f23473bb1d64c9b38e68 (diff) | |
build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134260 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_rpt.c')
| -rw-r--r-- | apps/app_rpt.c | 12 |
1 files changed, 6 insertions, 6 deletions
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; |