[asterisk-commits] mmichelson: branch 1.6.0 r133042 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jul 23 12:55:49 2008
New Revision: 133042

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

................
r133041 | mmichelson | 2008-07-23 12:54:03 -0500 (Wed, 23 Jul 2008) | 15 lines

Merged revisions 133038 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r133038 | mmichelson | 2008-07-23 12:50:01 -0500 (Wed, 23 Jul 2008) | 7 lines

Small cleanup. Move the declaration of the DAHDI_SPANINFO
variable to the block where it is used. This allows one
less #ifdef HAVE_PRI to clutter things up.

Thanks to Tzafrir for pointing this out on #asterisk-dev


........

................

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=133042&r1=133041&r2=133042
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Wed Jul 23 12:55:49 2008
@@ -8073,9 +8073,6 @@
 	struct dahdi_pvt *tmp = NULL, *tmp2,  *prev = NULL;
 	char fn[80];
 	struct dahdi_bufferinfo bi;
-#ifdef HAVE_PRI
-	struct dahdi_spaninfo si;
-#endif
 	int res;
 	int span = 0;
 	int here = 0;
@@ -8221,6 +8218,7 @@
 					destroy_dahdi_pvt(&tmp);
 					return NULL;
 				} else {
+					struct dahdi_spaninfo si;
 					si.spanno = 0;
 					if (ioctl(tmp->subs[SUB_REAL].zfd,DAHDI_SPANSTAT,&si) == -1) {
 						ast_log(LOG_ERROR, "Unable to get span status: %s\n", strerror(errno));