[svn-commits] tilghman: branch 1.6.0 r138413 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sat Aug 16 08:07:52 2008
New Revision: 138413

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

........
r138412 | tilghman | 2008-08-16 08:07:08 -0500 (Sat, 16 Aug 2008) | 2 lines

Fix compilation warnings (found with dev-mode)

........

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=138413&r1=138412&r2=138413
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Sat Aug 16 08:07:52 2008
@@ -11805,8 +11805,10 @@
 static int setup_dahdi(int reload);
 static int dahdi_restart(void)
 {
-
-	int i, j, cancel_code;
+#if defined(HAVE_PRI)
+	int i, j;
+#endif
+	int cancel_code;
 	struct dahdi_pvt *p;
 
 	ast_mutex_lock(&restart_lock);