aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2009-10-01 22:26:14 +0000
committerdcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2009-10-01 22:26:14 +0000
commit44276986f499c1524b85e6d4eb2adee4cd69a5e2 (patch)
tree7a68f138582a0e046714a128b037d963a0852d44
parent5d3ac4da25f1a17705ebf619477c80c6c30c8237 (diff)
Some systems (notably OS X Leopard) have fls() already, so rename ours to avoid conflict
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@66 632fc199-4ca6-4c93-a231-07263d6284db
-rw-r--r--jcdctmgr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/jcdctmgr.c b/jcdctmgr.c
index 67f8228..156957a 100644
--- a/jcdctmgr.c
+++ b/jcdctmgr.c
@@ -73,7 +73,7 @@ typedef my_fdct_controller * my_fdct_ptr;
* Find the highest bit in an integer through binary search.
*/
LOCAL(int)
-fls (UINT16 val)
+flss (UINT16 val)
{
int bit;
@@ -167,7 +167,7 @@ compute_reciprocal (UINT16 divisor, DCTELEM * dtbl)
UDCTELEM c;
int b, r;
- b = fls(divisor) - 1;
+ b = flss(divisor) - 1;
r = sizeof(DCTELEM) * 8 + b;
fq = ((UDCTELEM2)1 << r) / divisor;