From: Richard Mudgett Date: Wed, 18 Aug 2010 15:35:23 +0000 (+0000) Subject: Merged revisions 282671-282672 via svnmerge from X-Git-Tag: 11.0.0-beta1~2447 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a8c623ed25730bcb05cc67d9b663a64bdd09a82;p=thirdparty%2Fasterisk.git Merged revisions 282671-282672 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r282671 | rmudgett | 2010-08-18 10:27:51 -0500 (Wed, 18 Aug 2010) | 1 line Use the correct operator when calculating the PRI span devstate. ........ r282672 | rmudgett | 2010-08-18 10:28:27 -0500 (Wed, 18 Aug 2010) | 1 line Use the correct type for aoce_delayhangup bit field. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282673 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index c2089acc3e..14c43f8fac 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -3112,7 +3112,7 @@ static void dahdi_pri_update_span_devstate(struct sig_pri_span *pri) if (pri->pvts[idx]->owner #if defined(HAVE_PRI_SERVICE_MESSAGES) /* Out-of-service B channels are "in-use". */ - && pri->pvts[idx]->service_status + || pri->pvts[idx]->service_status #endif /* defined(HAVE_PRI_SERVICE_MESSAGES) */ ) { ++in_use; diff --git a/channels/sig_pri.h b/channels/sig_pri.h index f57d8f700e..5a770ce0b0 100644 --- a/channels/sig_pri.h +++ b/channels/sig_pri.h @@ -295,8 +295,8 @@ struct sig_pri_span { int fds[SIG_PRI_NUM_DCHANS]; /*!< FD's for d-channels */ #if defined(HAVE_PRI_AOC_EVENTS) - int aoc_passthrough_flag; /*!< Represents what AOC messages (S,D,E) are allowed to pass-through */ - int aoce_delayhangup:1; /*!< defines whether the aoce_delayhangup option is enabled or not */ + int aoc_passthrough_flag; /*!< Represents what AOC messages (S,D,E) are allowed to pass-through */ + unsigned int aoce_delayhangup:1; /*!< defines whether the aoce_delayhangup option is enabled or not */ #endif /* defined(HAVE_PRI_AOC_EVENTS) */ #if defined(HAVE_PRI_SERVICE_MESSAGES)