diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-08-02 10:52:28 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-08-02 10:52:28 +0200 |
| commit | 4aedacdf92ab2fc08a1e39618761bc1eb96427d6 (patch) | |
| tree | f000311e97598ab3fc42e2bea23e6cb342ad166c /app/lzo/src/lzo1x_d3.c | |
| parent | b28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (diff) | |
| parent | 0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 (diff) | |
Merge branch 'bug/There-are-two-different-notifications-#5794' into develop
Diffstat (limited to 'app/lzo/src/lzo1x_d3.c')
| -rw-r--r-- | app/lzo/src/lzo1x_d3.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/app/lzo/src/lzo1x_d3.c b/app/lzo/src/lzo1x_d3.c index 93cea502..8da06923 100644 --- a/app/lzo/src/lzo1x_d3.c +++ b/app/lzo/src/lzo1x_d3.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 @@ -67,7 +52,7 @@ #define COPY_DICT_DICT(m_len,m_off) \ { \ - register const lzo_bytep m_pos; \ + const lzo_bytep m_pos; \ m_off -= pd(op, out); assert(m_off > 0); \ if (m_off > dict_len) goto lookbehind_overrun; \ m_pos = dict_end - m_off; \ @@ -86,7 +71,7 @@ assert(m_len >= 2); assert(m_off > 0); assert(op > out); \ if (m_off <= pd(op, out)) \ { \ - register const lzo_bytep m_pos = op - m_off; \ + const lzo_bytep m_pos = op - m_off; \ DICT_MEMMOVE(op,m_pos,m_len,m_off) \ } \ else \ |