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.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82266 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/gsm/src/long_term.c b/codecs/gsm/src/long_term.c
index 50594ff..83b6fdf 100644 (file)
--- a/codecs/gsm/src/long_term.c
+++ b/codecs/gsm/src/long_term.c
@@ -162,7 +162,10 @@ static void Calculation_of_the_LTP_parameters P4((d,dp,bc_out,Nc_out),
        word            * Nc_out        /*              OUT     */
 )
 {
-       register int    k, lambda;
+       register int    k;
+#ifndef K6OPT
+       register int lambda;
+#endif
        word            Nc, bc;
        word            wt[40];
 

diff --git a/codecs/gsm/src/lpc.c b/codecs/gsm/src/lpc.c
index 49145f8..744149e 100644 (file)
--- a/codecs/gsm/src/lpc.c
+++ b/codecs/gsm/src/lpc.c
@@ -35,9 +35,12 @@ static void Autocorrelation P2((s, L_ACF),
  *  be scaled in order to avoid an overflow situation.
  */
 {
+#ifndef K6OPT
        register int    k, i;
+       word temp;
+#endif
 
-       word            temp, smax, scalauto;
+       word            smax, scalauto;
 
 #ifdef USE_FLOAT_MUL
        float           float_s[160];