Fix bool-vector-count-population bug on MinGW64.

* data.c (count_one_bits_word): Fix bug (negated comparison)
when BITS_PER_ULL < BITS_PER_BITS_WORD.

Fixes: debbugs:16535

diff --git a/src/ChangeLog b/src/ChangeLog
index 6dbaa5cbcf25ab5f8572e46db767ec34192e5784..e1e9cba76407c99d596645d18ebe689741d12938 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix bool-vector-count-population bug on MinGW64 (Bug#16535).
+       * data.c (count_one_bits_word): Fix bug (negated comparison)
+       when BITS_PER_ULL < BITS_PER_BITS_WORD.
+
 2014-01-24  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * xdisp.c (reseat_1, Fcurrent_bidi_paragraph_direction): Avoid

diff --git a/src/data.c b/src/data.c
index 1741f9083966ae425342439e5cb99a9013ef6bef..2a64c1bbf82f57a71a677a31573bb3d6c1912894 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -3012,7 +3012,7 @@ count_one_bits_word (bits_word w)
     {
       int i = 0, count = 0;
       while (count += count_one_bits_ll (w),
-            BITS_PER_BITS_WORD <= (i += BITS_PER_ULL))
+            (i += BITS_PER_ULL) < BITS_PER_BITS_WORD)
        w = shift_right_ull (w);
       return count;
     }