diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-30 22:41:23 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-30 22:41:23 +0000 |
| commit | 1a1de0727b435438d78005a2b8903e3f758e55d0 (patch) | |
| tree | 5cf75b8678686ce9e81ac4b469c9e8d955e2752d | |
| parent | abe4d4eff47990d2debcf442dcdbd153fad39e4d (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@134706 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/sched.h | 2 | ||||
| -rw-r--r-- | main/sched.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h index 56f7ab59c..3d249d200 100644 --- a/include/asterisk/sched.h +++ b/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); diff --git a/main/sched.c b/main/sched.c index 1b73086c5..88a259b40 100644 --- a/main/sched.c +++ b/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); |