[svn-commits] rmudgett: branch 1.4 r2307 - /branches/1.4/q931.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Nov 13 13:42:17 2012
New Revision: 2307

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=2307
Log:
Fix compiler error with ALERTING_NO_PROGRESS define.

Modified:
    branches/1.4/q931.c

Modified: branches/1.4/q931.c
URL: http://svnview.digium.com/svn/libpri/branches/1.4/q931.c?view=diff&rev=2307&r1=2306&r2=2307
==============================================================================
--- branches/1.4/q931.c (original)
+++ branches/1.4/q931.c Tue Nov 13 13:42:17 2012
@@ -5574,8 +5574,6 @@
 #ifdef ALERTING_NO_PROGRESS
 static int call_progress_ies[] = { -1 };
 #else
-static int call_progress_with_cause_ies[] = { Q931_CAUSE, Q931_PROGRESS_INDICATOR, -1 };
-
 static int call_progress_ies[] = { Q931_PROGRESS_INDICATOR, -1 };
 #endif
 
@@ -5604,6 +5602,12 @@
 	c->alive = 1;
 	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)
 {