Fix chan_dahd compiling with gcc 4.6 when PRI and SS7 not present.

(closes issue ASTERISK-18357)
Reported by: Matthew Nicholson


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@338224 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/1.8.11
Richard Mudgett 14 years ago
parent 915a93650b
commit b535088ac6

@ -12117,7 +12117,9 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
struct dahdi_bufferinfo bi;
int res;
#if defined(HAVE_PRI)
int span = 0;
#endif /* defined(HAVE_PRI) */
int here = 0;/*!< TRUE if the channel interface already exists. */
int x;
struct analog_pvt *analog_p = NULL;
@ -12210,7 +12212,9 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
tmp->law_default = p.curlaw;
tmp->law = p.curlaw;
tmp->span = p.spanno;
#if defined(HAVE_PRI)
span = p.spanno - 1;
#endif /* defined(HAVE_PRI) */
} else {
chan_sig = 0;
}
@ -13469,7 +13473,9 @@ static struct ast_channel *dahdi_request(const char *type, format_t format, cons
struct dahdi_pvt *exitpvt;
int channelmatched = 0;
int groupmatched = 0;
#if defined(HAVE_PRI) || defined(HAVE_SS7)
int transcapdigital = 0;
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
struct dahdi_starting_point start;
ast_mutex_lock(&iflock);
@ -13525,8 +13531,10 @@ static struct ast_channel *dahdi_request(const char *type, format_t format, cons
p->distinctivering = start.cadance;
break;
case 'd':
#if defined(HAVE_PRI) || defined(HAVE_SS7)
/* If this is an ISDN call, make it digital */
transcapdigital = AST_TRANS_CAP_DIGITAL;
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
break;
default:
ast_log(LOG_WARNING, "Unknown option '%c' in '%s'\n", start.opt, (char *)data);

Loading…
Cancel
Save