diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-29 18:18:50 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-29 18:18:50 +0200 |
| commit | 68e19d426ba6d9f048ebfdf337b93a85dc4d5b4c (patch) | |
| tree | cb33b2698e3f665546a328882c7481b11f633428 /main/lzo/src/config2a.h | |
| parent | d3aa9f835d7fd5f53d3a0da6778d46a7067bf074 (diff) | |
Update lzo version
--HG--
extra : rebase_source : 4310223035376c8ac1773fd03a43289aa96ce4f3
Diffstat (limited to 'main/lzo/src/config2a.h')
| -rw-r--r-- | main/lzo/src/config2a.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/main/lzo/src/config2a.h b/main/lzo/src/config2a.h index f290132d..16b74b03 100644 --- a/main/lzo/src/config2a.h +++ b/main/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); } |