kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 07:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
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 * \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; 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 * \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 * would be two or more in the list with that
* id. * id.
*/ */
#ifndef AST_DEVMODE
int ast_sched_del(struct ast_sched_context *con, int id) 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; struct sched *s = NULL;
int *last_id = ast_threadstorage_get(&last_del_id, sizeof(int)); int *last_id = ast_threadstorage_get(&last_del_id, sizeof(int));