[asterisk-commits] rmudgett: branch rmudgett/call_waiting r251930 - /team/rmudgett/call_waiting/...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Mar 11 16:26:55 2010
New Revision: 251930

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=251930
Log:
Compiling without libpri is good. Also reverted a callwait change in dahdi_request().

Modified:
    team/rmudgett/call_waiting/channels/chan_dahdi.c
    team/rmudgett/call_waiting/channels/sig_pri.h

Modified: team/rmudgett/call_waiting/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/call_waiting/channels/chan_dahdi.c?view=diff&rev=251930&r1=251929&r2=251930
==============================================================================
--- team/rmudgett/call_waiting/channels/chan_dahdi.c (original)
+++ team/rmudgett/call_waiting/channels/chan_dahdi.c Thu Mar 11 16:26:55 2010
@@ -12640,6 +12640,7 @@
 			&& available(&p, channelmatched)) {
 			ast_debug(1, "Using channel %d\n", p->channel);
 
+			callwait = (p->owner != NULL);
 #ifdef HAVE_OPENR2
 			if (p->mfcr2) {
 				ast_mutex_lock(&p->lock);
@@ -12657,13 +12658,6 @@
 				if (!p) {
 					break;
 				}
-			}
-			switch (p->sig) {
-			case SIG_PRI_LIB_HANDLE_CASES:
-				break;
-			default:
-				callwait = (p->owner != NULL);
-				break;
 			}
 
 			/* Make special notes */
@@ -12702,6 +12696,7 @@
 			}
 			if (!tmp) {
 				p->outgoing = 0;
+#if defined(HAVE_PRI)
 #if defined(HAVE_PRI_CALL_WAITING)
 				switch (p->sig) {
 				case SIG_PRI_LIB_HANDLE_CASES:
@@ -12714,6 +12709,7 @@
 					break;
 				}
 #endif	/* defined(HAVE_PRI_CALL_WAITING) */
+#endif	/* defined(HAVE_PRI) */
 			} else {
 				snprintf(p->dialstring, sizeof(p->dialstring), "DAHDI/%s", (char *) data);
 			}
@@ -17582,6 +17578,7 @@
 	return 0;
 }
 
+#if defined(HAVE_PRI)
 /*!
  * \internal
  * \brief qsort comparison function.
@@ -17617,7 +17614,9 @@
 
 	return pvt_left->channel - pvt_right->channel;
 }
-
+#endif	/* defined(HAVE_PRI) */
+
+#if defined(HAVE_PRI)
 /*!
  * \internal
  * \brief Sort the PRI B channel private pointer array.
@@ -17635,6 +17634,7 @@
 {
 	qsort(&pri->pvts, pri->numchans, sizeof(pri->pvts[0]), dahdi_cmp_pri_chans);
 }
+#endif	/* defined(HAVE_PRI) */
 
 /*!
  * \internal

Modified: team/rmudgett/call_waiting/channels/sig_pri.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/call_waiting/channels/sig_pri.h?view=diff&rev=251930&r1=251929&r2=251930
==============================================================================
--- team/rmudgett/call_waiting/channels/sig_pri.h (original)
+++ team/rmudgett/call_waiting/channels/sig_pri.h Thu Mar 11 16:26:55 2010
@@ -298,8 +298,6 @@
 	 * considering that span congested.
 	 */
 	int max_call_waiting_calls;
-#endif	/* defined(HAVE_PRI_CALL_WAITING) */
-#if defined(HAVE_PRI_CALL_WAITING)
 	struct {
 		int stripmsd;
 		unsigned int hidecallerid:1;
@@ -312,9 +310,7 @@
 		char context[AST_MAX_CONTEXT];
 		char mohinterpret[MAX_MUSICCLASS];
 	} ch_cfg;
-#endif	/* defined(HAVE_PRI_CALL_WAITING) */
-
-#if defined(HAVE_PRI_CALL_WAITING)
+
 	/*!
 	 * \brief Number of outstanding call waiting calls.
 	 * \note Must be zero to allow new calls from asterisk to