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/trunk@131986 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h
index f8d28d1..f9f65cf 100644 (file)
--- 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 6cc6286..6a6830b 100644 (file)
--- 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;