[svn-commits] tilghman: branch 1.6.0 r131990 - in /branches/1.6.0: ./ main/sched.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jul 18 12:11:10 2008
New Revision: 131990

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

................
r131989 | tilghman | 2008-07-18 12:10:34 -0500 (Fri, 18 Jul 2008) | 10 lines

Merged revisions 131988 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131988 | tilghman | 2008-07-18 12:10:01 -0500 (Fri, 18 Jul 2008) | 2 lines

Oops

........

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

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

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

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=131990&r1=131989&r2=131990
==============================================================================
--- branches/1.6.0/main/sched.c (original)
+++ branches/1.6.0/main/sched.c Fri Jul 18 12:11:10 2008
@@ -293,7 +293,11 @@
 
 	if (!s) {
 		ast_debug(1, "Attempted to delete nonexistent schedule entry %d!\n", id);
+#ifndef DEVMODE
+		ast_assert(s != NULL);
+#else
 		_ast_assert(0, "s != NULL", file, line, function);
+#endif
 		return -1;
 	}