[svn-commits] tilghman: branch 1.6.0 r131987 - in /branches/1.6.0: ./ include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jul 18 11:49:44 2008
New Revision: 131987

URL: http://svn.digium.com/view/asterisk?view=rev&rev=131987
Log:
Merged revisions 131986 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r131986 | tilghman | 2008-07-18 11:48:18 -0500 (Fri, 18 Jul 2008) | 10 lines

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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/sched.h
    branches/1.6.0/main/sched.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/sched.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/sched.h?view=diff&rev=131987&r1=131986&r2=131987
==============================================================================
--- branches/1.6.0/include/asterisk/sched.h (original)
+++ branches/1.6.0/include/asterisk/sched.h Fri Jul 18 11:49:44 2008
@@ -158,8 +158,12 @@
  * \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);
+#else
 int _ast_sched_del(struct sched_context *con, int id, const char *file, int line, const char *function);
 #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

Modified: branches/1.6.0/main/sched.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/sched.c?view=diff&rev=131987&r1=131986&r2=131987
==============================================================================
--- branches/1.6.0/main/sched.c (original)
+++ branches/1.6.0/main/sched.c Fri Jul 18 11:49:44 2008
@@ -263,7 +263,11 @@
  * 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;