[svn-commits] rmudgett: trunk r293082 - in /trunk: ./ channels/sig_pri.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Oct 26 11:33:50 2010
New Revision: 293082

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=293082
Log:
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.
........

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=293082&r1=293081&r2=293082
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Tue Oct 26 11:33:50 2010
@@ -1918,7 +1918,7 @@
 }
 #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 @@
 	/*! 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)
 /*!