From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 24 Jan 2014 20:55:22 +0000 (-0800)
Subject: Fix bool-vector-count-population bug on MinGW64.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~260
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0fadc0b0ae30c97b9c810476f3c96ed5ce25a1f9;p=emacs.git

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 6dbaa5cbcf2..e1e9cba7640 100644
--- 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 1741f908396..2a64c1bbf82 100644
--- 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;
     }