From: Richard Mudgett Date: Tue, 26 Oct 2010 16:33:50 +0000 (+0000) Subject: Merged revisions 293081 via svnmerge from X-Git-Tag: 11.0.0-beta1~2163 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6cdefbc07ebe8339f19195f61857fe0fcb0f919;p=thirdparty%2Fasterisk.git 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 --- diff --git a/channels/sig_pri.c b/channels/sig_pri.c index ee7933d0d3..fa73ac2094 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) /*!