From 5ed24f8155adf59a4134c92383c19dc3cae68033 Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Sat, 31 Oct 2009 13:43:43 -0400 Subject: celt_ilog2() is only used in fixed-point mode --- libcelt/mathops.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libcelt/mathops.h b/libcelt/mathops.h index 59d5045..9dad752 100644 --- a/libcelt/mathops.h +++ b/libcelt/mathops.h @@ -42,15 +42,6 @@ #include "entcode.h" #include "os_support.h" -#ifndef OVERRIDE_CELT_ILOG2 -/** Integer log in base2. Undefined for zero and negative numbers */ -static inline celt_int16 celt_ilog2(celt_word32 x) -{ - celt_assert2(x>0, "celt_ilog2() only defined for strictly positive numbers"); - return EC_ILOG(x)-1; -} -#endif - #ifndef OVERRIDE_FIND_MAX16 static inline int find_max16(celt_word16 *x, int len) { @@ -170,6 +161,16 @@ static inline float celt_exp2(float x) #include "os_support.h" +#ifndef OVERRIDE_CELT_ILOG2 +/** Integer log in base2. Undefined for zero and negative numbers */ +static inline celt_int16 celt_ilog2(celt_int32 x) +{ + celt_assert2(x>0, "celt_ilog2() only defined for strictly positive numbers"); + return EC_ILOG(x)-1; +} +#endif + + #ifndef OVERRIDE_CELT_MAXABS16 static inline celt_word16 celt_maxabs16(celt_word16 *x, int len) { -- cgit v1.2.3