[asterisk-commits] rizzo: branch 1.4 r48566 - /branches/1.4/include/asterisk/channel.h

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Mon Dec 18 11:23:29 2006
New Revision: 48566

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48566
Log:
unbreak the macro used for incrementing the frame counters.

I don't know when the bug was introduced, but with the typical usage

	c->fin = FRAMECOUNT_INC(c->fin)

the frame counters stay to 0.

affects trunk as well (fix coming).


Modified:
    branches/1.4/include/asterisk/channel.h

Modified: branches/1.4/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/channel.h?view=diff&rev=48566&r1=48565&r2=48566
==============================================================================
--- branches/1.4/include/asterisk/channel.h (original)
+++ branches/1.4/include/asterisk/channel.h Mon Dec 18 11:23:29 2006
@@ -270,7 +270,7 @@
 struct ast_channel_whisper_buffer;
 
 #define	DEBUGCHAN_FLAG  0x80000000
-#define	FRAMECOUNT_INC(x)	( ((x) & DEBUGCHAN_FLAG) | ((x++) & ~DEBUGCHAN_FLAG) )
+#define	FRAMECOUNT_INC(x)	( ((x) & DEBUGCHAN_FLAG) | (((x)+1) & ~DEBUGCHAN_FLAG) )
 
 enum ast_channel_adsicpe {
 	AST_ADSI_UNKNOWN,