From 68e19d426ba6d9f048ebfdf337b93a85dc4d5b4c Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 29 Jun 2014 18:18:50 +0200
Subject: Update lzo version

--HG--
extra : rebase_source : 4310223035376c8ac1773fd03a43289aa96ce4f3
---
 main/lzo/src/lzo1x_oo.ch | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'main/lzo/src/lzo1x_oo.ch')

diff --git a/main/lzo/src/lzo1x_oo.ch b/main/lzo/src/lzo1x_oo.ch
index 6bd2cf17..ebb406ff 100644
--- a/main/lzo/src/lzo1x_oo.ch
+++ b/main/lzo/src/lzo1x_oo.ch
@@ -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
@@ -43,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
 
@@ -121,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)
@@ -342,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 */
-- 
cgit v1.2.3