From 1fbde6a2f3273a0ef7e861460de1f25680024f32 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 23 Jul 2008 17:50:01 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@133038 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 08048baffb..722e398b85 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -7184,9 +7184,6 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, char fn[80]; #if 1 DAHDI_BUFFERINFO bi; -#endif -#ifdef HAVE_PRI - DAHDI_SPANINFO si; #endif int res; int span=0; @@ -7290,6 +7287,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, destroy_dahdi_pvt(&tmp); return NULL; } else { + DAHDI_SPANINFO si; si.spanno = 0; if (ioctl(tmp->subs[SUB_REAL].dfd,DAHDI_SPANSTAT,&si) == -1) { ast_log(LOG_ERROR, "Unable to get span status: %s\n", strerror(errno));