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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134706 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/sched.h

@@ -158,7 +158,7 @@ int ast_sched_replace_variable(int old_id, struct sched_context *con, int when,
  * \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);

main/sched.c

@@ -263,7 +263,7 @@ int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, co
  * 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 @@ int _ast_sched_del(struct sched_context *con, int id, const char *file, int line
 
 	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);