[src/random_deviate.c] don't compile alternate code if not needed

git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@12315 280ebfd0-de03-0410-8827-d642c229c3f4

1 files changed, 10 insertions, 14 deletions

diff --git a/src/random_deviate.c b/src/random_deviate.c
index a45a7ead6..1b2c9ceee 100644
--- a/src/random_deviate.c
+++ b/src/random_deviate.c
@@ -172,12 +172,13 @@ random_deviate_generate (mpfr_random_deviate_t x, mpfr_random_size_t k,
     }
 }
 
+#if MPFR_LIMB_MAX >= ULONG_MAX
 /*
  * return index [-1..127] of highest bit set.  Return -1 if x = 0, 2 if x = 4,
  * etc.  (From Algorithms for programmers by Joerg Arndt.)
  */
 static int
-highest_bit_idx_alt (unsigned long x)
+highest_bit_idx (unsigned long x)
 {
   int r = 0;
 
@@ -198,7 +199,7 @@ highest_bit_idx_alt (unsigned long x)
   if (x &  0x00000002UL) {           r +=  1; }
   return r;
 }
-
+#else
 /*
  * return index [-1..63] of highest bit set.
  * Return -1 if x = 0, 63 is if x = ~0 (for 64-bit unsigned long).
@@ -207,20 +208,15 @@ highest_bit_idx_alt (unsigned long x)
 static int
 highest_bit_idx (unsigned long x)
 {
-  /* this test should be evaluated at compile time */
-  if (sizeof (mp_limb_t) >= sizeof (unsigned long))
-    {
-      int cnt;
+  int cnt;
 
-      if (x == 0)
-        return -1;
-      count_leading_zeros (cnt, (mp_limb_t) x);
-      MPFR_ASSERTD (cnt <= GMP_NUMB_BITS - 1);
-      return GMP_NUMB_BITS - 1 - cnt;
-    }
-  else
-    return highest_bit_idx_alt (x);
+  if (x == 0)
+    return -1;
+  count_leading_zeros (cnt, (mp_limb_t) x);
+  MPFR_ASSERTD (cnt <= GMP_NUMB_BITS - 1);
+  return GMP_NUMB_BITS - 1 - cnt;
 }
+#endif
 
 /* return position of leading bit, counting from 1 */
 static mpfr_random_size_t