diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-12 19:42:56 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-12 19:42:56 +0000 |
| commit | 194e739ffe760e89c0b725b217e71ee0f720cdbf (patch) | |
| tree | 9bdb8d5f7748cddd462458b460ed962b5039d2fa /channels | |
| parent | 7b4850abebbf91e1fdcca11e35db4d34069674f6 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@251988 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 b726fb6d5..a0ee11fea 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -328,6 +328,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. @@ -509,7 +510,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 */ @@ -1293,11 +1294,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) |