diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-18 16:48:18 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-18 16:48:18 +0000 |
| commit | 59a2caa7f01a3db5c52113ffdf8c8732918895e0 (patch) | |
| tree | 1db55cdc2290f34db1cc0e8297a1415ff8f101ca | |
| parent | da51d253b47701ce7e591d13d8ab97ef3ce4344d (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@131986 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/sched.h | 4 | ||||
| -rw-r--r-- | main/sched.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h index f8d28d1a7..f9f65cfd9 100644 --- a/include/asterisk/sched.h +++ b/include/asterisk/sched.h @@ -210,8 +210,12 @@ const void *ast_sched_find_data(struct sched_context *con, int id); * \param id ID of the scheduled item to delete * \return Returns 0 on success, -1 on failure */ +#ifndef DEVMODE +int ast_sched_del(struct sched_context *con, int id) attribute_warn_unused_result; +#else int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function) attribute_warn_unused_result; #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 * Determine the number of seconds until the next outstanding event diff --git a/main/sched.c b/main/sched.c index 6cc62861b..6a6830b83 100644 --- a/main/sched.c +++ b/main/sched.c @@ -334,7 +334,11 @@ const void *ast_sched_find_data(struct sched_context *con, int id) * would be two or more in the list with that * 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) +#endif { struct sched *s, tmp; |