diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-07-31 12:09:49 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-07-31 12:09:49 +0200 |
| commit | 0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 (patch) | |
| tree | f000311e97598ab3fc42e2bea23e6cb342ad166c /app/lzo/src/lzo1x_9x.c | |
| parent | b28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (diff) | |
Updated ics-openvpn to rev 859 + no 2nd notification.
Diffstat (limited to 'app/lzo/src/lzo1x_9x.c')
| -rw-r--r-- | app/lzo/src/lzo1x_9x.c | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/app/lzo/src/lzo1x_9x.c b/app/lzo/src/lzo1x_9x.c index f910a69e..9de75df0 100644 --- a/app/lzo/src/lzo1x_9x.c +++ b/app/lzo/src/lzo1x_9x.c @@ -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 @@ -91,9 +76,9 @@ # define HEAD3(b,p) \ ((((((lzo_xint)b[p]<<3)^b[p+1])<<3)^b[p+2]) & (SWD_HSIZE-1)) #endif -#if 0 && defined(LZO_UNALIGNED_OK_4) && defined(LZO_ABI_LITTLE_ENDIAN) +#if 0 && (LZO_OPT_UNALIGNED32) && (LZO_ABI_LITTLE_ENDIAN) # define HEAD3(b,p) \ - (((* (lzo_uint32p) &b[p]) ^ ((* (lzo_uint32p) &b[p])>>10)) & (SWD_HSIZE-1)) + (((* (lzo_uint32_tp) &b[p]) ^ ((* (lzo_uint32_tp) &b[p])>>10)) & (SWD_HSIZE-1)) #endif #include "lzo_mchw.ch" @@ -111,7 +96,7 @@ lzo1x_999_compress_internal ( const lzo_bytep in , lzo_uint in_len, lzo_uint max_lazy, lzo_uint nice_length, lzo_uint max_chain, - lzo_uint32 flags ); + lzo_uint32_t flags ); /*********************************************************************** @@ -289,9 +274,9 @@ STORE_RUN ( LZO_COMPRESS_T *c, lzo_bytep op, const lzo_bytep ii, lzo_uint t ) else if (t <= 3) { #if defined(LZO1Z) - op[-1] |= LZO_BYTE(t); + op[-1] = LZO_BYTE(op[-1] | t); #else - op[-2] |= LZO_BYTE(t); + op[-2] = LZO_BYTE(op[-2] | t); #endif c->lit1_r++; } @@ -543,7 +528,7 @@ lzo1x_999_compress_internal ( const lzo_bytep in , lzo_uint in_len, lzo_uint max_lazy, lzo_uint nice_length, lzo_uint max_chain, - lzo_uint32 flags ) + lzo_uint32_t flags ) { lzo_bytep op; const lzo_bytep ii; @@ -821,7 +806,7 @@ lzo1x_999_compress_level ( const lzo_bytep in , lzo_uint in_len, lzo_uint max_lazy; lzo_uint nice_length; lzo_uint max_chain; - lzo_uint32 flags; + lzo_uint32_t flags; } c[9] = { /* faster compression */ { 0, 0, 0, 8, 4, 0 }, |