diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-06-02 22:51:01 +0100 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-06-02 22:51:01 +0100 |
| commit | fea57a6d2a1a4c0232fb7ac3fa1d449134f5a481 (patch) | |
| tree | 9074cfaed7a3231aa7f621cbf03985c3ad2b6477 /lzo/src/lzo1x_oo.ch | |
| parent | f92b88bc6c65ba71dad92fe7da7b7085607b439a (diff) | |
| download | syslinux-fea57a6d2a1a4c0232fb7ac3fa1d449134f5a481.tar.gz | |
Import lzo-2.09baserock/pedroalvarez/gcc6
Diffstat (limited to 'lzo/src/lzo1x_oo.ch')
| -rw-r--r-- | lzo/src/lzo1x_oo.ch | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/lzo/src/lzo1x_oo.ch b/lzo/src/lzo1x_oo.ch index e978f399..82871bbb 100644 --- a/lzo/src/lzo1x_oo.ch +++ b/lzo/src/lzo1x_oo.ch @@ -2,19 +2,7 @@ This file is part of the LZO real-time data compression library. - 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-2015 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -40,6 +28,7 @@ #define TEST_IP (ip < ip_end) #define TEST_OP (op <= op_end) +#define TEST_IP_AND_TEST_OP (TEST_IP && TEST_OP) #define NO_LIT LZO_UINT_MAX @@ -118,7 +107,7 @@ DO_OPTIMIZE ( lzo_bytep in , lzo_uint in_len, } assert(*ip < 16 || (*ip == 17 && in_len == 3)); - while (TEST_IP && TEST_OP) + while (TEST_IP_AND_TEST_OP) { t = *ip++; if (t >= 16) @@ -339,7 +328,7 @@ match_done: match_next: do *op++ = *ip++; while (--t > 0); t = *ip++; - } while (TEST_IP && TEST_OP); + } while (TEST_IP_AND_TEST_OP); } /* no EOF code was found */ @@ -360,7 +349,4 @@ eof_found: } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ |