Merged revisions 131982 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r131982 | tilghman | 2008-07-18 11:33:56 -0500 (Fri, 18 Jul 2008) | 10 lines

Merged revisions 131970 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131970 | tilghman | 2008-07-18 11:30:31 -0500 (Fri, 18 Jul 2008) | 2 lines

Make the ast_assert call within ast_sched_del report something useful.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131984 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-18 16:36:39 +00:00
parent 68c5ddc970
commit 5abbe30e52
3 changed files with 6 additions and 5 deletions

View File

@@ -158,7 +158,8 @@ int ast_sched_replace_variable(int old_id, struct sched_context *con, int when,
* \param id ID of the scheduled item to delete
* \return Returns 0 on success, -1 on failure
*/
int ast_sched_del(struct sched_context *con, int id);
int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function);
#define ast_sched_del(a, b) _ast_sched_del(a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__)
/*! \brief Determines number of seconds until the next outstanding event to take place
* Determine the number of seconds until the next outstanding event