summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2010-10-26 16:33:50 +0000
committerRichard Mudgett <rmudgett@digium.com>2010-10-26 16:33:50 +0000
commitf6cdefbc07ebe8339f19195f61857fe0fcb0f919 (patch)
tree9f8c4779246e0b9ae5455037c2178122164358d1
parentb6c5dde767ee515a338bdd1458f9b37570c5e0fa (diff)
Merged revisions 293081 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r293081 | rmudgett | 2010-10-26 11:32:59 -0500 (Tue, 26 Oct 2010) | 1 line No need to define the struct if there are no users. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/sig_pri.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index ee7933d0d..fa73ac209 100644
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -1918,7 +1918,7 @@ static void sig_pri_connected_line_copy_transfer(struct ast_party_connected_line
}
#endif /* defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER) */
-#if defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER)
+#if defined(HAVE_PRI_TRANSFER)
struct xfer_rsp_data {
struct sig_pri_span *pri;
/*! Call to send transfer success/fail response over. */
@@ -1926,7 +1926,7 @@ struct xfer_rsp_data {
/*! Invocation ID to use when sending a reply to the transfer request. */
int invoke_id;
};
-#endif /* defined(HAVE_PRI_CALL_HOLD) || defined(HAVE_PRI_TRANSFER) */
+#endif /* defined(HAVE_PRI_TRANSFER) */
#if defined(HAVE_PRI_TRANSFER)
/*!