]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 293081 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Tue, 26 Oct 2010 16:33:50 +0000 (16:33 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 26 Oct 2010 16:33:50 +0000 (16:33 +0000)
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

channels/sig_pri.c

index ee7933d0d3c4198f63cf185906434d52a0fbde61..fa73ac2094d1fc6e855bbfd4e9fe3e06f93e32cf 100644 (file)
@@ -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)
 /*!