diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 17:28:05 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 17:28:05 +0200 |
| commit | 6a4ba5d3976f6d219400a46c634dd479bc5981a5 (patch) | |
| tree | b9514fea0817906859843475fe8455070de25064 /lzo/src/lzo1x_1.c | |
| parent | 73d3b9c032eae2074726cd3668546af1c44a8323 (diff) | |
Update lzo version
Diffstat (limited to 'lzo/src/lzo1x_1.c')
| -rw-r--r-- | lzo/src/lzo1x_1.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/lzo/src/lzo1x_1.c b/lzo/src/lzo1x_1.c index ac4b85cd..ca60c44a 100644 --- a/lzo/src/lzo1x_1.c +++ b/lzo/src/lzo1x_1.c @@ -2,6 +2,9 @@ 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 @@ -38,13 +41,30 @@ */ -#define LZO_NEED_DICT_H +#include "lzo_conf.h" +#if 1 && defined(UA_GET32) +#undef LZO_DICT_USE_PTR +#define LZO_DICT_USE_PTR 0 +#undef lzo_dict_t +#define lzo_dict_t unsigned short +#endif + +#define LZO_NEED_DICT_H 1 +#ifndef D_BITS #define D_BITS 14 +#endif #define D_INDEX1(d,p) d = DM(DMUL(0x21,DX3(p,5,5,6)) >> 5) #define D_INDEX2(d,p) d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f) - +#if 1 +#define DINDEX(dv,p) DM(((DMUL(0x1824429d,dv)) >> (32-D_BITS))) +#else +#define DINDEX(dv,p) DM((dv) + ((dv) >> (32-D_BITS))) +#endif #include "config1x.h" +#define LZO_DETERMINISTIC !(LZO_DICT_USE_PTR) +#ifndef DO_COMPRESS #define DO_COMPRESS lzo1x_1_compress +#endif #include "lzo1x_c.ch" |