diff options
| author | Martin Storsjo <martin@martin.st> | 2012-11-01 11:15:28 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-11-01 11:30:58 +0200 |
| commit | 9285c096fe4b8810a290875d73d35a4496e7c4b3 (patch) | |
| tree | a825547141e8885053890396d6888f32c9465b20 /libFDK | |
| parent | 48cfc02cbf7016a4c1e3d537fa0bba4278f2c173 (diff) | |
| download | fdk-aac-9285c096fe4b8810a290875d73d35a4496e7c4b3.tar.gz fdk-aac-9285c096fe4b8810a290875d73d35a4496e7c4b3.tar.bz2 fdk-aac-9285c096fe4b8810a290875d73d35a4496e7c4b3.zip | |
Revert "Use __builtin_clz instead of default implementation of fixnormz on GCC"
This reverts commit e036dbc8eb7d5fdd02dc70faff20e9ac3e2989ca.
Upstream took __builtin_clz in use (in the new header
libFDK/include/x86/clz_x86.h, together with an alternative
implementation for MSVC), so this change can be dropped to
minimize the differences.
Diffstat (limited to 'libFDK')
| -rw-r--r-- | libFDK/include/clz.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libFDK/include/clz.h b/libFDK/include/clz.h index d276002..38c5073 100644 --- a/libFDK/include/clz.h +++ b/libFDK/include/clz.h @@ -118,11 +118,6 @@ inline INT fixnormz_S (SHORT a) { return fixnormz_D((INT)(a)); } -#elif defined(__GNUC__) -inline INT fixnormz_S (SHORT a) -{ - return a ? __builtin_clz(a) : 16; -} #else inline INT fixnormz_S (SHORT a) { @@ -139,12 +134,6 @@ inline INT fixnormz_S (SHORT a) #endif #if !defined(FUNCTION_fixnormz_D) -#if defined(__GNUC__) -inline INT fixnormz_D (LONG a) -{ - return a ? __builtin_clz(a) : 32; -} -#else inline INT fixnormz_D (LONG a) { INT leadingBits = 0; @@ -157,7 +146,6 @@ inline INT fixnormz_D (LONG a) return (leadingBits); } #endif -#endif /***************************************************************************** |