[asterisk-commits] file: trunk r82266 - in /trunk: ./ codecs/gsm/src/

[SVN commits to the Asterisk project]

Author: file
Date: Tue Sep 11 16:43:47 2007
New Revision: 82266

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82266
Log:
Merged revisions 82265 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82265 | file | 2007-09-11 18:41:49 -0300 (Tue, 11 Sep 2007) | 4 lines

(closes issue #10679)
Reported by: andrew
Build under dev mode when K6OPTS is enabled.

........

Modified:
    trunk/   (props changed)
    trunk/codecs/gsm/src/long_term.c
    trunk/codecs/gsm/src/lpc.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/codecs/gsm/src/long_term.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/gsm/src/long_term.c?view=diff&rev=82266&r1=82265&r2=82266
==============================================================================
--- trunk/codecs/gsm/src/long_term.c (original)
+++ trunk/codecs/gsm/src/long_term.c Tue Sep 11 16:43:47 2007
@@ -162,7 +162,10 @@
 	word		* Nc_out	/* 		OUT	*/
 )
 {
-	register int  	k, lambda;
+	register int  	k;
+#ifndef K6OPT
+	register int lambda;
+#endif
 	word		Nc, bc;
 	word		wt[40];
 

Modified: trunk/codecs/gsm/src/lpc.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/gsm/src/lpc.c?view=diff&rev=82266&r1=82265&r2=82266
==============================================================================
--- trunk/codecs/gsm/src/lpc.c (original)
+++ trunk/codecs/gsm/src/lpc.c Tue Sep 11 16:43:47 2007
@@ -35,9 +35,12 @@
  *  be scaled in order to avoid an overflow situation.
  */
 {
+#ifndef K6OPT
 	register int	k, i;
-
-	word		temp, smax, scalauto;
+	word temp;
+#endif
+
+	word		smax, scalauto;
 
 #ifdef	USE_FLOAT_MUL
 	float		float_s[160];