diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2015-09-05 18:56:55 -0700 |
---|---|---|
committer | Hans Kristian Rosbach <hk-git@circlestorm.org> | 2015-11-03 19:12:42 +0100 |
commit | 46c21b18e01ad2d9104973f51086985a0237a292 (patch) | |
tree | b6d28a4a241c9230f7de8c3ab4d6d67c963d208c /adler32.c | |
parent | f7e045e8ad125e99965fd2873fa7898fe3c2d649 (diff) |
Clean up portability for shifts and integer sizes.
Diffstat (limited to 'adler32.c')
-rw-r--r-- | adler32.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -9,7 +9,7 @@ static uint32_t adler32_combine_(uint32_t adler1, uint32_t adler2, z_off64_t len2); -#define BASE 65521 /* largest prime smaller than 65536 */ +#define BASE 65521U /* largest prime smaller than 65536 */ #define NMAX 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ @@ -162,7 +162,7 @@ static uint32_t adler32_combine_(uint32_t adler1, uint32_t adler2, z_off64_t len sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; if (sum1 >= BASE) sum1 -= BASE; if (sum1 >= BASE) sum1 -= BASE; - if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1); if (sum2 >= BASE) sum2 -= BASE; return sum1 | (sum2 << 16); } |