sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "sched: Make ABI compatible between dev mode and non-dev mode." into 16

This commit is contained in:
George Joseph 2018-07-23 13:32:24 -05:00 committed by Gerrit Code Review
parent 648541fe89 0f999a834f
commit 03b1078117
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/asterisk/sched.h
View File

@ -284,12 +284,7 @@ const void *ast_sched_find_data(struct ast_sched_context *con, int id);
*
* \return Returns 0 on success, -1 on failure
*/
#ifndef AST_DEVMODE
int ast_sched_del(struct ast_sched_context *con, int id) attribute_warn_unused_result;
#else
int _ast_sched_del(struct ast_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

4
main/sched.c
View File

@ -608,11 +608,7 @@ const void *ast_sched_find_data(struct ast_sched_context *con, int id)
* would be two or more in the list with that
* id.
*/
#ifndef AST_DEVMODE
int ast_sched_del(struct ast_sched_context *con, int id)
#else
int _ast_sched_del(struct ast_sched_context *con, int id, const char *file, int line, const char *function)
#endif
{
struct sched *s = NULL;
int *last_id = ast_threadstorage_get(&last_del_id, sizeof(int));