Some systems (notably OS X Leopard) have fls() already, so rename ours to avoid conflict

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3903 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/jpeg/jcdctmgr.c b/common/jpeg/jcdctmgr.c
index 67f8228028f423f81b2e14703cb7ea22650f6d2a..156957ab6677311d13e250503a3875724261dfe8 100644 (file)
--- a/common/jpeg/jcdctmgr.c
+++ b/common/jpeg/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;