diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-12 19:33:22 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-12 19:33:22 +0000 |
| commit | 4dd4e98ed4071361a613134e2b7ec4efb7101041 (patch) | |
| tree | 8e74e6ba1cd917dd042f1e4c6aedcadac088ad32 /channels | |
| parent | 9e83b1e7371fa5fce5e017a88279aaf899cd4966 (diff) | |
Make chan_dahdi wakeup_sub() prototype not conditional.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@251986 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 257a888f4..212399339 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) |