[asterisk-commits] rmudgett: branch rmudgett/dahdi_facility r219221 - /team/rmudgett/dahdi_facil...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Sep 17 11:19:56 2009
New Revision: 219221

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=219221
Log:
Consolidate BUGBUG conditional lines to remove easier during testing.

Modified:
    team/rmudgett/dahdi_facility/channels/sig_pri.c

Modified: team/rmudgett/dahdi_facility/channels/sig_pri.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/rmudgett/dahdi_facility/channels/sig_pri.c?view=diff&rev=219221&r1=219220&r2=219221
==============================================================================
--- team/rmudgett/dahdi_facility/channels/sig_pri.c (original)
+++ team/rmudgett/dahdi_facility/channels/sig_pri.c Thu Sep 17 11:19:56 2009
@@ -50,6 +50,7 @@
 #ifndef PRI_EVENT_FACILITY
 #error please update libpri
 #endif
+#define HAVE_PRI_CALL_HOLD 1	/* BUGBUG remove this line and put test in configure.ac */
 
 /* define this to send PRI user-user information elements */
 #undef SUPPORT_USERUSER
@@ -2430,7 +2431,7 @@
 				}
 				break;
 			case PRI_EVENT_NOTIFY:
-#if defined(HAVE_PRI)	/* BUGBUG */
+#if defined(HAVE_PRI_CALL_HOLD)
 				chanpos = pri_find_principle(pri, e->notify.channel, e->notify.call);
 #else
 				chanpos = pri_find_principle(pri, e->notify.channel, NULL);
@@ -2463,7 +2464,7 @@
 					sig_pri_unlock_private(pri->pvts[chanpos]);
 				}
 				break;
-#if defined(HAVE_PRI)	/* BUGBUG */
+#if defined(HAVE_PRI_CALL_HOLD)
 			case PRI_EVENT_HOLD:
 				chanpos = pri_find_principle(pri, e->hold.channel, e->hold.call);
 				if (chanpos < 0) {
@@ -2506,17 +2507,17 @@
 				pri_hold_ack(pri->pri, e->hold.call);
 				break;
 #endif	/* defined(HAVE_PRI_CALL_HOLD) */
-#if defined(HAVE_PRI)	/* BUGBUG */
+#if defined(HAVE_PRI_CALL_HOLD)
 			case PRI_EVENT_HOLD_ACK:
 				ast_debug(1, "Event: HOLD_ACK\n");
 				break;
 #endif	/* defined(HAVE_PRI_CALL_HOLD) */
-#if defined(HAVE_PRI)	/* BUGBUG */
+#if defined(HAVE_PRI_CALL_HOLD)
 			case PRI_EVENT_HOLD_REJ:
 				ast_debug(1, "Event: HOLD_REJ\n");
 				break;
 #endif	/* defined(HAVE_PRI_CALL_HOLD) */
-#if defined(HAVE_PRI)	/* BUGBUG */
+#if defined(HAVE_PRI_CALL_HOLD)
 			case PRI_EVENT_RETRIEVE:
 				if (!(e->retrieve.channel & PRI_HELD_CALL)
 					|| pri_find_principle(pri, e->retrieve.channel, e->retrieve.call) < 0) {
@@ -2566,12 +2567,12 @@
 					PVT_TO_CHANNEL(pri->pvts[chanpos]));
 				break;
 #endif	/* defined(HAVE_PRI_CALL_HOLD) */
-#if defined(HAVE_PRI)	/* BUGBUG */
+#if defined(HAVE_PRI_CALL_HOLD)
 			case PRI_EVENT_RETRIEVE_ACK:
 				ast_debug(1, "Event: RETRIEVE_ACK\n");
 				break;
 #endif	/* defined(HAVE_PRI_CALL_HOLD) */
-#if defined(HAVE_PRI)	/* BUGBUG */
+#if defined(HAVE_PRI_CALL_HOLD)
 			case PRI_EVENT_RETRIEVE_REJ:
 				ast_debug(1, "Event: RETRIEVE_REJ\n");
 				break;