[svn-commits] kpfleming: branch 1.6.0 r132793 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Tue Jul 22 17:15:54 2008
New Revision: 132793

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

........
r132791 | kpfleming | 2008-07-22 17:14:37 -0500 (Tue, 22 Jul 2008) | 2 lines

correct fix made in r132777... the code *did* compile in dev-mode, as long as libpri was installed and enabled

........

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=132793&r1=132792&r2=132793
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Tue Jul 22 17:15:54 2008
@@ -8072,8 +8072,9 @@
 	/* Make a dahdi_pvt structure for this interface (or CRV if "pri" is specified) */
 	struct dahdi_pvt *tmp = NULL, *tmp2,  *prev = NULL;
 	char fn[80];
-#if 1
 	struct dahdi_bufferinfo bi;
+#ifdef HAVE_PRI
+	struct dahdi_spaninfo si;
 #endif
 	int res;
 	int span = 0;