aboutsummaryrefslogtreecommitdiff
path: root/blocksort.c
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2021-12-13 19:28:53 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-12-13 19:28:53 +0000
commit984a9c5ba942f35e18c3b904252fc249febeba4e (patch)
treec025e10d17e7a75839680f1c89e2576718cf53e3 /blocksort.c
parentaf4fb9fa8f24e111103a8101d85b660c90d1e2e4 (diff)
parent8645cf6c0da81fb958450394f463ff7c66edb49b (diff)
downloadbzip2-984a9c5ba942f35e18c3b904252fc249febeba4e.tar.gz
Merge "Really sync with bzip1.0.8."
Diffstat (limited to 'blocksort.c')
-rw-r--r--blocksort.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/blocksort.c b/blocksort.c
index d0d662c..92d81fe 100644
--- a/blocksort.c
+++ b/blocksort.c
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.6 of 6 September 2010
- Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.8 of 13 July 2019
+ Copyright (C) 1996-2019 Julian Seward <jseward@acm.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap,
bhtab [ 0 .. 2+(nblock/32) ] destroyed
*/
-#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
-#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
-#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
+#define SET_BH(zz) bhtab[(zz) >> 5] |= ((UInt32)1 << ((zz) & 31))
+#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~((UInt32)1 << ((zz) & 31))
+#define ISSET_BH(zz) (bhtab[(zz) >> 5] & ((UInt32)1 << ((zz) & 31)))
#define WORD_BH(zz) bhtab[(zz) >> 5]
#define UNALIGNED_BH(zz) ((zz) & 0x01f)