[svn-commits] jpeeler: branch 1.6.0 r138519 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Sun Aug 17 21:14:02 2008
New Revision: 138519

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138519
Log:
Merged revisions 138518 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r138518 | jpeeler | 2008-08-17 21:13:04 -0500 (Sun, 17 Aug 2008) | 1 line

add missing define for SS7 in dahdi_restart
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=138519&r1=138518&r2=138519
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Sun Aug 17 21:14:02 2008
@@ -11805,7 +11805,7 @@
 static int setup_dahdi(int reload);
 static int dahdi_restart(void)
 {
-#if defined(HAVE_PRI)
+#if defined(HAVE_PRI) || defined(HAVE_SS7)
 	int i, j;
 #endif
 	int cancel_code;