[asterisk-commits] kpfleming: trunk r91133 - /trunk/channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Dec  4 21:48:53 2007
New Revision: 91133

URL: http://svn.digium.com/view/asterisk?view=rev&rev=91133
Log:
revert part of my changes from earlier today since this code is no longer dependent on libpri.h

Modified:
    trunk/channels/chan_zap.c

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=91133&r1=91132&r2=91133
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Tue Dec  4 21:48:53 2007
@@ -5855,10 +5855,7 @@
 	tmp->cid.cid_pres = i->callingpres;
 	tmp->cid.cid_ton = i->cid_ton;
 	tmp->cid.cid_ani2 = i->cid_ani2;
-/* TODO: enable this code for HAVE_SS7 when PRI_TRANS_CAP_DIGITAL gets renamed
-   and doesn't come from libpri.h any longer
-*/
-#if defined(HAVE_PRI)
+#if defined(HAVE_PRI) || defined(HAVE_SS7)
 	tmp->transfercapability = transfercapability;
 	pbx_builtin_setvar_helper(tmp, "TRANSFERCAPABILITY", ast_transfercapability2str(transfercapability));
 	if (transfercapability & AST_TRANS_CAP_DIGITAL)