Fix tests on x86_64.

2007-01-04  Behdad Esfahbod  <behdad@gnome.org>

        * tests/bit-test.c (builtin_bit_nth_lsf1), (builtin_bit_nth_lsf2),
        (builtin_bit_nth_msf): Fix tests on x86_64.

svn path=/trunk/; revision=5216

diff --git a/ChangeLog b/ChangeLog
index 217318d..103e08a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-04  Behdad Esfahbod  <behdad@gnome.org>
+
+       * tests/bit-test.c (builtin_bit_nth_lsf1), (builtin_bit_nth_lsf2),
+       (builtin_bit_nth_msf): Fix tests on x86_64.
+
 2007-01-03  Behdad Esfahbod  <behdad@gnome.org>
 
        * glib/goption.c (_g_unichar_get_width), (_g_utf8_strwidth),

diff --git a/tests/bit-test.c b/tests/bit-test.c
index 4fba905..230c852 100644 (file)
--- a/tests/bit-test.c
+++ b/tests/bit-test.c
@@ -13,7 +13,7 @@ builtin_bit_nth_lsf1 (gulong mask, gint nth_bit)
   if (nth_bit >= 0)
     {
       if (G_LIKELY (nth_bit < GLIB_SIZEOF_LONG * 8 - 1))
-       mask &= -(1<<(nth_bit+1));
+       mask &= -(1UL<<(nth_bit+1));
       else
        mask = 0;
     }
@@ -26,7 +26,7 @@ builtin_bit_nth_lsf2 (gulong mask, gint nth_bit)
   if (nth_bit >= 0)
     {
       if (G_LIKELY (nth_bit < GLIB_SIZEOF_LONG * 8 - 1))
-       mask &= -(1<<(nth_bit+1));
+       mask &= -(1UL<<(nth_bit+1));
       else
        mask = 0;
     }
@@ -37,7 +37,7 @@ static gint
 builtin_bit_nth_msf (gulong mask, gint nth_bit)
 {
   if (nth_bit >= 0 && nth_bit < GLIB_SIZEOF_LONG * 8)
-    mask &= (1<<nth_bit)-1;
+    mask &= (1UL<<nth_bit)-1;
   return mask ? GLIB_SIZEOF_LONG * 8 - 1 - __builtin_clzl(mask) : -1;
 }