From 3cf9da77468515c263a28a019c26afe3505bdfcf Mon Sep 17 00:00:00 2001 From: mmichelson Date: Wed, 23 Jul 2008 17:54:03 +0000 Subject: [PATCH] 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 ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133041 f38db490-d61c-443f-a65b-d21fe96a405b --- 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 149a51acb..3884a4f23 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -8230,9 +8230,6 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, 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; @@ -8379,6 +8376,7 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, 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));