diff options
| author | Elliott Hughes <enh@google.com> | 2021-12-13 20:50:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-13 20:50:17 +0000 |
| commit | 07c706276528bdcf0061fc936be15155d32fb9f4 (patch) | |
| tree | c025e10d17e7a75839680f1c89e2576718cf53e3 /blocksort.c | |
| parent | 31cda0aa166d53d93c2f3d271ad24801e5844fa0 (diff) | |
| parent | e86ffaf4a22b873b9df132a2745ccc7f088ce438 (diff) | |
| download | bzip2-07c706276528bdcf0061fc936be15155d32fb9f4.tar.gz | |
Merge "Really sync with bzip1.0.8." am: 984a9c5ba9 am: f85f90d030 am: 019cf7b5e4 am: e86ffaf4a2
Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/1915250
Change-Id: I1970c819e51a1688fb95cad0640fed28931d0836
Diffstat (limited to 'blocksort.c')
| -rw-r--r-- | blocksort.c | 10 |
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) |