[asterisk-commits] tilghman: branch 1.6.1 r138414 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sat Aug 16 08:08:23 2008
New Revision: 138414

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138414
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.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Sat Aug 16 08:08:23 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361,138409
+/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361,138409,138412

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=138414&r1=138413&r2=138414
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Sat Aug 16 08:08:23 2008
@@ -12000,8 +12000,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);