diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-03 15:38:26 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-03 16:11:17 +0000 |
commit | 4a0890daf4c9839711f9013a35b1912ed341e956 (patch) | |
tree | 8ae5c6780a1fcd2124e71f27ad9b4256acd24268 /src/config2a.h | |
parent | 2cdfe9375f1145603d002c12be950062ae54da21 (diff) | |
download | lzo-4a0890daf4c9839711f9013a35b1912ed341e956.tar.gz |
Import 2.08 tarballbaserock/tiagogomes/armv8l64
Diffstat (limited to 'src/config2a.h')
-rw-r--r-- | src/config2a.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/config2a.h b/src/config2a.h index f290132..16b74b0 100644 --- a/src/config2a.h +++ b/src/config2a.h @@ -2,22 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -136,14 +121,14 @@ /* get bits */ #define _NEEDBITS \ - { _NEEDBYTE; b |= ((lzo_uint32) _NEXTBYTE) << k; k += 8; assert(k <= 32); } + { _NEEDBYTE; b |= ((lzo_uint32_t) _NEXTBYTE) << k; k += 8; assert(k <= 32); } #define NEEDBITS(j) { assert((j) < 8); if (k < (j)) _NEEDBITS } /* set bits */ -#define SETBITS(j,x) { b |= (x) << k; k += (j); assert(k <= 32); } +#define SETBITS(j,x) { b |= ((lzo_uint32_t)(x)) << k; k += (j); assert(k <= 32); } /* access bits */ -#define MASKBITS(j) (b & ((((lzo_uint32)1 << (j)) - 1))) +#define MASKBITS(j) (b & ((((lzo_uint32_t)1 << (j)) - 1))) /* drop bits */ #define DUMPBITS(j) { assert(k >= j); b >>= (j); k -= (j); } |