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

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Jul 30 17:41:23 2008
New Revision: 134706

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

........
r134703 | tilghman | 2008-07-30 17:38:58 -0500 (Wed, 30 Jul 2008) | 2 lines

Oops, wrong define

........

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=134706&r1=134705&r2=134706
==============================================================================
--- branches/1.6.0/include/asterisk/sched.h (original)
+++ branches/1.6.0/include/asterisk/sched.h Wed Jul 30 17:41:23 2008
@@ -158,7 +158,7 @@
  * \param id ID of the scheduled item to delete
  * \return Returns 0 on success, -1 on failure
  */
-#ifndef DEVMODE
+#ifndef AST_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);

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=134706&r1=134705&r2=134706
==============================================================================
--- branches/1.6.0/main/sched.c (original)
+++ branches/1.6.0/main/sched.c Wed Jul 30 17:41:23 2008
@@ -263,7 +263,7 @@
  * would be two or more in the list with that
  * id.
  */
-#ifndef DEVMODE
+#ifndef AST_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)
@@ -293,7 +293,7 @@
 
 	if (!s) {
 		ast_debug(1, "Attempted to delete nonexistent schedule entry %d!\n", id);
-#ifndef DEVMODE
+#ifndef AST_DEVMODE
 		ast_assert(s != NULL);
 #else
 		_ast_assert(0, "s != NULL", file, line, function);