[svn-commits] mmichelson: branch group/issue8824 r166567 - in /team/group/issue8824: ./ main/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Dec 23 09:11:59 2008
New Revision: 166567

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166567
Log:
Resolve conflict and reset automerge


Modified:
    team/group/issue8824/   (props changed)
    team/group/issue8824/main/channel.c

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/issue8824/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 23 09:11:59 2008
@@ -1,1 +1,1 @@
-/trunk:1-166478
+/trunk:1-166566

Modified: team/group/issue8824/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/main/channel.c?view=diff&rev=166567&r1=166566&r2=166567
==============================================================================
--- team/group/issue8824/main/channel.c (original)
+++ team/group/issue8824/main/channel.c Tue Dec 23 09:11:59 2008
@@ -3391,6 +3391,9 @@
 	/* The channel driver does not support this indication, let's fake
 	 * it by doing our own tone generation if applicable. */
 
+	/*!\note If we compare the enumeration type, which does not have any
+	 * negative constants, the compiler may optimize this code away.
+	 * Therefore, we must perform an integer comparison here. */
 	if (_condition < 0) {
 		/* Stop any tones that are playing */
 		ast_playtones_stop(chan);