From: Adam Tkac <atkac@redhat.com>
Date: Tue, 19 Jan 2010 11:16:49 +0000 (+0000)
Subject: [Bugfix] Some systems (notably OS X Leopard) have fls() already, so rename
X-Git-Tag: v1.0.1~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bc8c368018d45b4dc458abc1c03650377ebfe72c;p=tigervnc.git

[Bugfix] Some systems (notably OS X Leopard) have fls() already, so rename
ours to avoid conflict (dcommander).


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_0@3947 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/common/jpeg/jcdctmgr.c b/common/jpeg/jcdctmgr.c
index 67f82280..156957ab 100644
--- 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;