[svn-commits] rmudgett: branch 1.6.1 r251990 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Mar 12 13:44:11 2010
New Revision: 251990

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=251990
Log:
Merged revisions 251987 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r251987 | rmudgett | 2010-03-12 13:40:16 -0600 (Fri, 12 Mar 2010) | 9 lines
  
  Merged revisions 251986 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r251986 | rmudgett | 2010-03-12 13:33:22 -0600 (Fri, 12 Mar 2010) | 1 line
    
    Make chan_dahdi wakeup_sub() prototype not conditional.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=251990&r1=251989&r2=251990
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Fri Mar 12 13:44:11 2010
@@ -334,6 +334,7 @@
 #define DEFAULT_RINGT 				( (8000 * 8) / READ_SIZE) /*!< 8,000 ms */
 
 struct dahdi_pvt;
+struct dahdi_pri;
 
 /*!
  * \brief Configured ring timeout base.
@@ -515,7 +516,7 @@
 #define MAX_SLAVES	4
 
 static struct dahdi_pvt {
-	ast_mutex_t lock;
+	ast_mutex_t lock;					/*!< Channel private lock. */
 	struct ast_channel *owner;			/*!< Our current active owner (if applicable) */
 							/*!< Up to three channels can be associated with this call */
 		
@@ -1312,11 +1313,7 @@
 	return res;
 }
 
-#ifdef HAVE_PRI
 static void wakeup_sub(struct dahdi_pvt *p, int a, struct dahdi_pri *pri)
-#else
-static void wakeup_sub(struct dahdi_pvt *p, int a, void *pri)
-#endif
 {
 #ifdef HAVE_PRI
 	if (pri)