439527ac · 439527ac · 439527ac · 439527ac · 439527ac · 439527ac
--- a/lib_com/tns_base.c
+++ b/lib_com/tns_base.c
--- a/lib_com/tools.c
+++ b/lib_com/tools.c
@@ -687,11 +687,7 @@ Word32 dotp_fixed_o(
    move16();
    test();
    test();
-#ifdef OPT_MCT_ENC_V2_BE
    FOR( ; ( suma > MAX_32 ) || ( suma < MIN_32 ) || ( *res_q > 31 ); )
-#else
-    WHILE( GT_64( suma, MAX_32 ) || LT_64( suma, MIN_32 ) || GT_16( *res_q, 31 ) )
-#endif
    {
        suma = W_shr( suma, 1 );
        *res_q = sub( *res_q, 1 );
@@ -721,11 +717,7 @@ Word32 dotp_fixed_32(
    move16();
    test();
    test();
-#ifdef OPT_MCT_ENC_V2_BE
    FOR( ; ( suma > MAX_32 ) || ( suma < MIN_32 ) || ( *res_q > 31 ); )
-#else
-    WHILE( GT_64( suma, MAX_32 ) || LT_64( suma, MIN_32 ) || GT_16( *res_q, 31 ) )
-#endif
    {
        suma = W_shr( suma, 1 );
        *res_q = sub( *res_q, 1 );

--- a/lib_com/tools_fx.c
+++ b/lib_com/tools_fx.c
--- a/lib_com/wi_fx.c
+++ b/lib_com/wi_fx.c
--- a/lib_com/window_fx.c
+++ b/lib_com/window_fx.c
--- a/lib_dec/FEC_HQ_core_fx.c
+++ b/lib_dec/FEC_HQ_core_fx.c
--- a/lib_dec/FEC_HQ_phase_ecu_fx.c
+++ b/lib_dec/FEC_HQ_phase_ecu_fx.c
--- a/lib_dec/FEC_fx.c
+++ b/lib_dec/FEC_fx.c
--- a/lib_dec/LD_music_post_filter_fx.c
+++ b/lib_dec/LD_music_post_filter_fx.c
--- a/lib_dec/acelp_core_switch_dec_fx.c
+++ b/lib_dec/acelp_core_switch_dec_fx.c
--- a/lib_dec/core_dec_init_fx.c
+++ b/lib_dec/core_dec_init_fx.c
--- a/lib_dec/dec_LPD_fx.c
+++ b/lib_dec/dec_LPD_fx.c
--- a/lib_dec/dec_gen_voic_fx.c
+++ b/lib_dec/dec_gen_voic_fx.c
--- a/lib_dec/dec_higher_acelp_fx.c
+++ b/lib_dec/dec_higher_acelp_fx.c
--- a/lib_dec/dec_pit_exc_fx.c
+++ b/lib_dec/dec_pit_exc_fx.c
--- a/lib_dec/dec_post_fx.c
+++ b/lib_dec/dec_post_fx.c
--- a/lib_dec/dec_tcx_fx.c
+++ b/lib_dec/dec_tcx_fx.c
--- a/lib_dec/er_dec_tcx_fx.c
+++ b/lib_dec/er_dec_tcx_fx.c
--- a/lib_dec/er_util_fx.c
+++ b/lib_dec/er_util_fx.c
--- a/lib_dec/fd_cng_dec_fx.c
+++ b/lib_dec/fd_cng_dec_fx.c