Compatibility with GCC < 4.0 is not needed any longer

[libucw.git] / ucw / bitops.h

diff --git a/ucw/bitops.h b/ucw/bitops.h
index ffc788c5f1b60f58d230f6593893d0a989a00071..21f40c47fc140a8c9e34a3b69665dc51baf29cce 100644 (file)
--- a/ucw/bitops.h
+++ b/ucw/bitops.h
@@ -26,7 +26,7 @@ extern const byte ffs_table[256];
 
 #ifdef __pentium4              /* On other ia32 machines, the C version is faster */
 
-static inline uns bit_ffs(uns w)
+static inline uint bit_ffs(uint w)
 {
   asm("bsfl %1,%0" :"=r" (w) :"rm" (w));
   return w;
@@ -34,9 +34,9 @@ static inline uns bit_ffs(uns w)
 
 #else
 
-static inline uns bit_ffs(uns w)
+static inline uint bit_ffs(uint w)
 {
-  uns b = (w & 0xffff) ? 0 : 16;
+  uint b = (w & 0xffff) ? 0 : 16;
   b += ((w >> b) & 0xff) ? 0 : 8;
   return b + ffs_table[(w >> b) & 0xff];
 }
@@ -45,26 +45,9 @@ static inline uns bit_ffs(uns w)
 
 /* Count the number of bits set */
 
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-
-static inline uns bit_count(uns w)
+static inline uint bit_count(uint w)
 {
   return __builtin_popcount(w);
 }
 
-#else
-
-static inline uns bit_count(uns w)
-{
-  uns n = 0;
-  while (w)
-    {
-      w &= w - 1;
-      n++;
-    }
-  return n;
-}
-
-#endif
-
 #endif