[asterisk-commits] rmudgett: trunk r282673 - in /trunk: ./ channels/chan_dahdi.c channels/sig_pri.h

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Aug 18 10:35:23 2010
New Revision: 282673

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=282673
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c
    trunk/channels/sig_pri.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=282673&r1=282672&r2=282673
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Wed Aug 18 10:35:23 2010
@@ -3112,7 +3112,7 @@
 			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;

Modified: trunk/channels/sig_pri.h
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.h?view=diff&rev=282673&r1=282672&r2=282673
==============================================================================
--- trunk/channels/sig_pri.h (original)
+++ trunk/channels/sig_pri.h Wed Aug 18 10:35:23 2010
@@ -295,8 +295,8 @@
 	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)