kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve Solaris build issues and add some API documentation.

Browse Source 
(issue #14981)
Reported by: snuffy


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@190989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-04-29 08:51:21 +00:00
parent a082ad616f
commit 2c1ffef923
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/asterisk/channel.h
View File

@@ -2073,8 +2073,27 @@ struct ast_group_info {
} \ } \
} while (0) } while (0)
/*!
* \brief Increase channel reference count
*
* \param c the channel
*
* \retval c always
*
* \since 1.6.3
*/
#define ast_channel_ref(c) ({ ao2_ref(c, +1); (c); }) #define ast_channel_ref(c) ({ ao2_ref(c, +1); (c); })
#define ast_channel_unref(c) ({ ao2_ref(c, -1); (NULL); })
/*!
* \brief Decrease channel reference count
*
* \param c the channel
*
* \retval NULL always
*
* \since 1.6.3
*/
#define ast_channel_unref(c) ({ ao2_ref(c, -1); (struct ast_channel *) (NULL); })
/*! Channel Iterating @{ */ /*! Channel Iterating @{ */

6
main/rtp_engine.c
View File

@@ -1540,7 +1540,8 @@ int ast_rtp_instance_make_compatible(struct ast_channel *chan, struct ast_rtp_in
if (!peer_instance || peer_instance->engine != instance->engine) { if (!peer_instance || peer_instance->engine != instance->engine) {
ast_channel_unlock(peer); ast_channel_unlock(peer);
peer_instance = (ao2_ref(peer_instance, -1), NULL); ao2_ref(peer_instance, -1);
peer_instance = NULL;
return -1; return -1;
} }
@@ -1548,7 +1549,8 @@ int ast_rtp_instance_make_compatible(struct ast_channel *chan, struct ast_rtp_in
ast_channel_unlock(peer); ast_channel_unlock(peer);
peer_instance = (ao2_ref(peer_instance, -1), NULL); ao2_ref(peer_instance, -1);
peer_instance = NULL;
return res; return res;
} }