<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9569">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sched: Make ABI compatible between dev mode and non-dev mode.<br><br>In the past there was an assertion in the ast_sched_del function<br>and in order to ensure it was useful the calling function name,<br>line number, and filename had to be passed in. This cause the ABI<br>to be different between dev mode and non-dev mode.<br><br>This assertion is no longer present so the special logic can be<br>removed to make it the same between them both.<br><br>Change-Id: Icbc69c801e357d7004efc5cf2ab936d9b83b6ab8<br>---<br>M include/asterisk/sched.h<br>M main/sched.c<br>2 files changed, 0 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h</span><br><span>index fb63081..804b05c 100644</span><br><span>--- a/include/asterisk/sched.h</span><br><span>+++ b/include/asterisk/sched.h</span><br><span>@@ -284,12 +284,7 @@</span><br><span>  *</span><br><span>  * \return Returns 0 on success, -1 on failure</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef AST_DEVMODE</span><br><span> int ast_sched_del(struct ast_sched_context *con, int id) attribute_warn_unused_result;</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">-int _ast_sched_del(struct ast_sched_context *con, int id, const char *file, int line, const char *function) attribute_warn_unused_result;</span><br><span style="color: hsl(0, 100%, 40%);">-#define   ast_sched_del(a, b)     _ast_sched_del(a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__)</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> /*!</span><br><span>  * \brief Determines number of seconds until the next outstanding event to take place</span><br><span>diff --git a/main/sched.c b/main/sched.c</span><br><span>index d8afc74..848b4c2 100644</span><br><span>--- a/main/sched.c</span><br><span>+++ b/main/sched.c</span><br><span>@@ -608,11 +608,7 @@</span><br><span>  * would be two or more in the list with that</span><br><span>  * id.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef AST_DEVMODE</span><br><span> int ast_sched_del(struct ast_sched_context *con, int id)</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">-int _ast_sched_del(struct ast_sched_context *con, int id, const char *file, int line, const char *function)</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> {</span><br><span>      struct sched *s = NULL;</span><br><span>      int *last_id = ast_threadstorage_get(&last_del_id, sizeof(int));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9569">change 9569</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9569"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 15 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Icbc69c801e357d7004efc5cf2ab936d9b83b6ab8 </div>
<div style="display:none"> Gerrit-Change-Number: 9569 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>