[asterisk-commits] tilghman: trunk r292970 - in /trunk: ./ channels/sig_pri.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Oct 25 16:16:25 2010
New Revision: 292970

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=292970
Log:
Merged revisions 292969 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r292969 | tilghman | 2010-10-25 16:15:19 -0500 (Mon, 25 Oct 2010) | 2 lines
  
  Several more defines that need to be altered for compiling against an older version of libpri
........

Modified:
    trunk/   (props changed)
    trunk/channels/sig_pri.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.c?view=diff&rev=292970&r1=292969&r2=292970
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Mon Oct 25 16:16:25 2010
@@ -1427,7 +1427,7 @@
 }
 #endif	/* defined(HAVE_PRI_CALL_HOLD) */
 
-#if defined(HAVE_PRI_CALL_HOLD)
+#if defined(HAVE_PRI_TRANSFER)
 /*!
  * \internal
  * \brief Find the channel associated with the libpri call.
@@ -1453,7 +1453,7 @@
 	}
 	return -1;
 }
-#endif	/* defined(HAVE_PRI_CALL_HOLD) */
+#endif	/* defined(HAVE_PRI_TRANSFER) */
 
 static void *do_idle_thread(void *v_pvt)
 {
@@ -5595,7 +5595,7 @@
 						sig_pri_lock_private(pri->pvts[chanpos]);
 						sig_pri_handle_subcmds(pri, chanpos, e->e, e->hangup.channel,
 							e->hangup.subcmds, e->hangup.call);
-#if defined(HAVE_PRI_CALL_HOLD)
+#if defined(HAVE_PRI_TRANSFER)
 						if (e->hangup.call_active && e->hangup.call_held
 							&& pri->hold_disconnect_transfer) {
 							/* We are to transfer the call instead of simply hanging up. */
@@ -5606,7 +5606,7 @@
 							}
 							sig_pri_lock_private(pri->pvts[chanpos]);
 						}
-#endif	/* defined(HAVE_PRI_CALL_HOLD) */
+#endif	/* defined(HAVE_PRI_TRANSFER) */
 						switch (e->hangup.cause) {
 						case PRI_CAUSE_USER_BUSY:
 						case PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION: