diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-08-18 18:22:54 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-08-18 18:22:54 +0200 |
| commit | 31f6eab32a26a658cbfb2db0d457cc1f87d23f0f (patch) | |
| tree | 75f372ff22a94102ef2f9bd163febf54ac45e9d6 /app/lzo/src/config2a.h | |
| parent | 6057466bc8b4475bf4564b9143c60753c90f9aaa (diff) | |
| parent | 7d8cde4f7ae769a3b6a25483d8bd0bb6c1551af9 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/lzo/src/config2a.h')
| -rw-r--r-- | app/lzo/src/config2a.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/app/lzo/src/config2a.h b/app/lzo/src/config2a.h index f290132d..16b74b03 100644 --- a/app/lzo/src/config2a.h +++ b/app/lzo/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); } |