From 0bc0edcda9d7db1c6a6381d07652fee985479a73 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Fri, 12 Mar 2010 19:33:22 +0000 Subject: [PATCH] Make chan_dahdi wakeup_sub() prototype not conditional. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@251986 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 257a888f4b..2123993394 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -292,6 +292,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. @@ -427,7 +428,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 */ @@ -1117,11 +1118,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) -- 2.47.2