From 9f0f616c1ecef3da33963110566b623f2c794e9b Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Fri, 3 Oct 2008 22:51:22 +0000 Subject: [PATCH] Change some preprocessor macros to struct definitions so that we get app_rpt to build with DAHDI. (closes issue #13576) Reported by: blitzrage git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@146244 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_rpt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 7b209378cb..305161df47 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -2901,7 +2901,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; @@ -4157,7 +4157,7 @@ pthread_attr_t attr; 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; @@ -4467,7 +4467,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){ @@ -8759,7 +8759,7 @@ char *tele,*idtalkover,c; int ms = MSWAIT,i,lasttx=0,val,remrx=0,identqueued,othertelemqueued; int tailmessagequeued,ctqueued,dtmfed; 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; @@ -10564,8 +10564,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; -- 2.47.3