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 98c6ed9973c29c3517109c4c400d4585792ddbb3..4617677b0bd200895d92b14ab8c9c90111ec0c15 100644 (file)
--- 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)