Commit 035ffc04 authored by sagnowski's avatar sagnowski
Browse files

Minimize diff to merge base

parent c9ef891b

basic_math/log2.c

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ Word32 pow_10(Word32 x , Word16 *Q) 
  Word32 L_tmp;

  Word16 n1,i;

  Word16 count = 0;



#ifdef BASOP_NOGLOB

  Flag Overflow;

#endif /* BASOP_NOGLOB */

basic_op/enh40.h

+1 −2
Original line number Diff line number Diff line
@@ -169,8 +169,7 @@ static __inline Word40 L40_set (Word40 L40_var1) { 
  return (L40_var_out);

}



// #endif /* ifdef _MSC_VER */



/* #endif */ /* ifdef _MSC_VER */





/*****************************************************************************

basic_op/enh64.c

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ Word64 W_shl (Word64 L64_var1, Word16 var2) { 
  multiCounter[currCounter].W_shl++;

#endif

 

//  BASOP_CHECK();

/*  BASOP_CHECK();*/

 

  return (L64_var_out);

}
@@ -324,7 +324,7 @@ Word64 W_shl_nosat (Word64 L64_var1, Word16 var2) { 
  multiCounter[currCounter].W_shl_nosat++;

#endif

 

//  BASOP_CHECK ();

/*  BASOP_CHECK();*/

 

  return (L64_var_out);

}

lib_com/basop_util.c

+0 −1
Original line number Diff line number Diff line
@@ -1363,7 +1363,6 @@ Word32 norm_llQ31( /* o : normalized result Q31 */ 
{

    Word16 i;

    Word32 L_tmp;



#ifdef BASOP_NOGLOB

    Flag Overflow;

    Flag Carry;

lib_com/env_stab_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ Word16 env_stability_fx( /* in Q15 */ 
    Word16 exp, exp2;

    Word32 L_tmp, L_env_delta;

    Word16 inv_nb_sfm;



#ifdef BASOP_NOGLOB

    Flag Overflow = 0;

#endif /* BASOP_NOGLOB */