diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-10-25 21:16:25 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-10-25 21:16:25 +0000 |
| commit | f96d27b9179504a768d0b879e158d62a7a01564c (patch) | |
| tree | 0631720f80c48c965d7a90c967c4183ad7f7ff7f /channels/sig_pri.c | |
| parent | 7bc278bd0674be59cce8058fe5af24daf9615118 (diff) | |
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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292970 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_pri.c')
| -rw-r--r-- | channels/sig_pri.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/sig_pri.c b/channels/sig_pri.c index 7b937082d..95dc171c6 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -1427,7 +1427,7 @@ static int pri_find_empty_nobch(struct sig_pri_span *pri) } #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 @@ static int pri_find_pri_call(struct sig_pri_span *pri, q931_call *call) } 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 @@ static void *pri_dchannel(void *vpri) 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 @@ static void *pri_dchannel(void *vpri) } 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: |