[svn-commits] rmudgett: branch 1.4 r251986 - /branches/1.4/channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Mar 12 13:33:22 2010
New Revision: 251986

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=251986
Log:
Make chan_dahdi wakeup_sub() prototype not conditional.

Modified:
    branches/1.4/channels/chan_dahdi.c

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=251986&r1=251985&r2=251986
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Fri Mar 12 13:33:22 2010
@@ -292,6 +292,7 @@
 #define DEFAULT_RINGT 				( (8000 * 8) / READ_SIZE) /*!< 8,000 ms */
 
 struct dahdi_pvt;
+struct dahdi_pri;
 
 /*!
  * \brief Configured ring timeout base.
@@ -427,7 +428,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 */
 		
@@ -1117,11 +1118,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)