From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 12 Mar 2010 19:44:11 +0000 (+0000)
Subject: Merged revisions 251987 via svnmerge from
X-Git-Tag: 1.6.1.19-rc1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bafb8f1ce2cf9547c585478811f1d02b48fc8028;p=thirdparty%2Fasterisk.git

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.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@251990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 98c6ed9973..4617677b0b 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -334,6 +334,7 @@ static inline int dahdi_wait_event(int fd)
 #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 @@ struct dahdi_subchannel {
 #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 @@ static int dahdi_get_index(struct ast_channel *ast, struct dahdi_pvt *p, int nul
 	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)