summaryrefslogtreecommitdiffstats
path: root/Utilities/cmbzip2/blocksort.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-02-24 17:11:59 (GMT)
committerBrad King <brad.king@kitware.com>2020-02-24 17:11:59 (GMT)
commit592ce3e89baaacc78f445ae2b6316456eeb5cf20 (patch)
tree9f80a8a5d705a6923609104588525a970080e260 /Utilities/cmbzip2/blocksort.c
parent39f2a9b286bb5346df3a17026aa8b4a1e327caa2 (diff)
parent03e9d5afb34b6e951b6f4c60fdf71b61690910fc (diff)
downloadCMake-592ce3e89baaacc78f445ae2b6316456eeb5cf20.zip
CMake-592ce3e89baaacc78f445ae2b6316456eeb5cf20.tar.gz
CMake-592ce3e89baaacc78f445ae2b6316456eeb5cf20.tar.bz2
Merge branch 'upstream-bzip2' into update-bzip2
# By bzip2 upstream * upstream-bzip2: bzip2 2019-07-13 (6a8690fc)
Diffstat (limited to 'Utilities/cmbzip2/blocksort.c')
-rw-r--r--Utilities/cmbzip2/blocksort.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Utilities/cmbzip2/blocksort.c b/Utilities/cmbzip2/blocksort.c
index bd2dec1..92d81fe 100644
--- a/Utilities/cmbzip2/blocksort.c
+++ b/Utilities/cmbzip2/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.5 of 10 December 2007
- Copyright (C) 1996-2007 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)