Fix compiler error with ALERTING_NO_PROGRESS define.

git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@2307 2fbb986a-6c06-0410-b554-c9c1f0a7f128
This commit is contained in:
Richard Mudgett 2012-11-13 19:42:17 +00:00
parent cdb844c16b
commit de78c8d37f

8
q931.c
View File

@ -5574,8 +5574,6 @@ int q931_notify(struct pri *ctrl, q931_call *c, int channel, int info)
#ifdef ALERTING_NO_PROGRESS #ifdef ALERTING_NO_PROGRESS
static int call_progress_ies[] = { -1 }; static int call_progress_ies[] = { -1 };
#else #else
static int call_progress_with_cause_ies[] = { Q931_CAUSE, Q931_PROGRESS_INDICATOR, -1 };
static int call_progress_ies[] = { Q931_PROGRESS_INDICATOR, -1 }; static int call_progress_ies[] = { Q931_PROGRESS_INDICATOR, -1 };
#endif #endif
@ -5605,6 +5603,12 @@ int q931_call_progress(struct pri *ctrl, q931_call *c, int channel, int info)
return send_message(ctrl, c, Q931_PROGRESS, call_progress_ies); return send_message(ctrl, c, Q931_PROGRESS, call_progress_ies);
} }
#ifdef ALERTING_NO_PROGRESS
static int call_progress_with_cause_ies[] = { Q931_CAUSE, -1 };
#else
static int call_progress_with_cause_ies[] = { Q931_CAUSE, Q931_PROGRESS_INDICATOR, -1 };
#endif
int q931_call_progress_with_cause(struct pri *ctrl, q931_call *c, int channel, int info, int cause) int q931_call_progress_with_cause(struct pri *ctrl, q931_call *c, int channel, int info, int cause)
{ {
if (c->ourcallstate == Q931_CALL_STATE_CALL_INDEPENDENT_SERVICE) { if (c->ourcallstate == Q931_CALL_STATE_CALL_INDEPENDENT_SERVICE) {