kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't define a local function with the same name as a library function (bug #4239)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-05-15 03:18:16 +00:00
parent 0356b70224
commit 977fd5a157
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
codecs/log2comp.h
View File

@@ -24,7 +24,7 @@
#if defined(WANT_ASM) && defined(_MSC_VER) && defined(_M_IX86)
/* MS C Inline Asm */
# pragma warning( disable : 4035 )
static inline int log2(int val) { __asm
static inline int ilog2(int val) { __asm
{
xor eax, eax
dec eax
@@ -33,7 +33,7 @@ static inline int log2(int val) { __asm
# pragma warning( default : 4035 )
#elif defined(WANT_ASM) && defined(__GNUC__) && (defined(__i386__) || defined(i386))
/* GNU Inline Asm */
static inline int log2(int val)
static inline int ilog2(int val)
{
int a;
__asm__
@@ -48,12 +48,22 @@ static inline int log2(int val)
);
return a;
}
#elif defined(WANT_ASM) && defined(__GNUC__) && defined(__powerpc__)
static inline int ilog2(int val)
{
int a;
__asm__ ("cntlzw %0,%1"
: "=r" (a)
: "r" (val)
);
return 31-a;
}
#else
/* no ASM for this compiler and/or platform */
/* rather slow base 2 log computation
* Using looped shift.
*/
static inline int log2(int val)
static inline int ilog2(int val)
{
int i;
for (i = -1; val; ++i, val >>= 1)