diff options
author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-08-18 15:35:23 +0000 |
---|---|---|
committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-08-18 15:35:23 +0000 |
commit | db188e7478f81ba4cd17cbfae7c148ceb4eade66 (patch) | |
tree | 0dd0baf6911a68753a841d01b176aab812b43d17 /channels/sig_pri.h | |
parent | 3baae21d2a25ff18d5531e29986120a69e48e6d4 (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@282673 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/sig_pri.h')
-rw-r--r-- | channels/sig_pri.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/sig_pri.h b/channels/sig_pri.h index f57d8f700..5a770ce0b 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) |