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: https://origsvn.digium.com/svn/asterisk/trunk@133041 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 149a51a..3884a4f 100644 (file)
--- 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));