kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 02:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 131986 via svnmerge from

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

................
r131986 | tilghman | 2008-07-18 11:48:18 -0500 (Fri, 18 Jul 2008) | 10 lines

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

........
r131985 | tilghman | 2008-07-18 11:46:23 -0500 (Fri, 18 Jul 2008) | 2 lines

Preserve ABI compatibility with last change

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131987 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-18 16:49:44 +00:00
parent 5abbe30e52
commit c01f4f499e
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asterisk/sched.h
View File

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

4
main/sched.c
View File

@@ -263,7 +263,11 @@ int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, co
* would be two or more in the list with that * would be two or more in the list with that
* id. * id.
*/ */
#ifndef DEVMODE
int ast_sched_del(struct sched_context *con, int id)
#else
int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function) int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function)
#endif
{ {
struct sched *s; struct sched *s;